diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9d4b1fd..1dd9303 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,15 +39,15 @@ jobs: Includes: * Python ${{ env.PY_VERSION }}.? - * OpenSSL 3.0.5 + * OpenSSL 3.1.2 * BZip2 1.0.8 - * XZ 5.2.6 - * LibFFI 3.4.2 + * XZ 5.4.4 + * LibFFI 3.4.4 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} build: - runs-on: macOS-12 + runs-on: macOS-latest needs: make-release strategy: max-parallel: 4 diff --git a/Makefile b/Makefile index 80a5f36..fc78a15 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ CURL_FLAGS=--disable --fail --location --create-dirs --progress-bar # macOS targets TARGETS-macOS=macosx.x86_64 macosx.arm64 -VERSION_MIN-macOS=10.15 +VERSION_MIN-macOS=11.0 CFLAGS-macOS=-mmacosx-version-min=$(VERSION_MIN-macOS) # iOS targets @@ -842,6 +842,7 @@ $$(PYTHON_SRCDIR-$(sdk))/Makefile: \ CPP=$$(TARGET_TRIPLE-$(sdk))-cpp \ CFLAGS="$$(CFLAGS-$(sdk)) -I$$(BZIP2_MERGE-$(sdk))/include -I$$(XZ_MERGE-$(sdk))/include" \ LDFLAGS="$$(LDFLAGS-$(sdk)) -L$$(XZ_MERGE-$(sdk))/lib -L$$(BZIP2_MERGE-$(sdk))/lib" \ + MACOSX_DEPLOYMENT_TARGET="$$(VERSION_MIN-$(os))" \ --prefix="$$(PYTHON_INSTALL-$(sdk))" \ --enable-ipv6 \ --enable-universalsdk \ diff --git a/README.rst b/README.rst index 8a70fab..516e04b 100644 --- a/README.rst +++ b/README.rst @@ -12,6 +12,7 @@ repository: * `Python 3.10 `__ * `Python 3.11 `__ * `Python 3.12 `__ +* `Python 3.13 `__ It works by downloading, patching, and building a fat binary of Python and selected pre-requisites, and packaging them as static libraries that can be incorporated into an @@ -41,10 +42,10 @@ The binaries support x86_64 and arm64 for macOS; arm64 for iOS and appleTV devices; and arm64_32 for watchOS. It also supports device simulators on both x86_64 and M1 hardware. This should enable the code to run on: -* macOS 10.15 (Catalina) or later, on: +* macOS 11 (Big Sur) or later, on: * MacBook (including MacBooks using Apple Silicon) * iMac (including iMacs using Apple Silicon) - * Mac Mini (including M1 Apple Silicon Mac minis) + * Mac Mini (including Apple Silicon Mac minis) * Mac Studio (all models) * Mac Pro (all models) * iOS 12.0 or later, on: diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch index fbc67a6..7ecc5c5 100644 --- a/patch/Python/Python.patch +++ b/patch/Python/Python.patch @@ -294,7 +294,7 @@ index f0792de74a..7bbade8814 100644 shared = os.path.join(dir, shared_f) dylib = os.path.join(dir, dylib_f) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 509f99ae8e..a1bf71dee7 100644 +index 509f99ae8e..b2cbfefd53 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -49,7 +49,7 @@ @@ -306,7 +306,7 @@ index 509f99ae8e..a1bf71dee7 100644 _CASE_INSENSITIVE_PLATFORMS = (_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY + _CASE_INSENSITIVE_PLATFORMS_STR_KEY) -@@ -1599,6 +1599,60 @@ +@@ -1599,6 +1599,59 @@ return 'FileFinder({!r})'.format(self.path) @@ -353,10 +353,9 @@ index 509f99ae8e..a1bf71dee7 100644 + + def find_spec(self, fullname, path, target=None): + name = fullname.split(".")[-1] -+ framework_name = "_".join(fullname.split(".")) + + for extension in EXTENSION_SUFFIXES: -+ dylib_file = _path_join(self.frameworks_path, f"{framework_name}.framework", f"{name}{extension}") ++ dylib_file = _path_join(self.frameworks_path, f"{fullname}.framework", f"{name}{extension}") + _bootstrap._verbose_message('Looking for Apple Framework dylib {}', dylib_file) + if _path_isfile(dylib_file): + loader = AppleFrameworkLoader(fullname, dylib_file, path) @@ -367,7 +366,7 @@ index 509f99ae8e..a1bf71dee7 100644 # Import setup ############################################################### def _fix_up_module(ns, name, pathname, cpathname=None): -@@ -1706,3 +1760,7 @@ +@@ -1706,3 +1759,7 @@ supported_loaders = _get_supported_file_loaders() sys.path_hooks.extend([FileFinder.path_hook(*supported_loaders)]) sys.meta_path.append(PathFinder) @@ -2985,7 +2984,7 @@ index 23e58ed046..6d7dff0abf 100644 NULL, }; diff --git a/Python/importlib_external.h b/Python/importlib_external.h -index 8e0650a7dc..4fc3e7f49f 100644 +index 8e0650a7dc..1f0bcacd67 100644 --- a/Python/importlib_external.h +++ b/Python/importlib_external.h @@ -1,7 +1,7 @@ @@ -3024,7 +3023,7 @@ index 8e0650a7dc..4fc3e7f49f 100644 100,78,156,2,100,79,100,80,132,3,90,65,71,0,100,81, 100,82,132,0,100,82,131,2,90,66,71,0,100,83,100,84, 132,0,100,84,131,2,90,67,71,0,100,85,100,86,132,0, -@@ -45,2782 +45,2954 @@ +@@ -45,2609 +45,2765 @@ 71,0,100,95,100,96,132,0,100,96,131,2,90,74,71,0, 100,97,100,98,132,0,100,98,131,2,90,75,71,0,100,99, 100,100,132,0,100,100,131,2,90,76,71,0,100,101,100,102, @@ -7442,6 +7441,157 @@ index 8e0650a7dc..4fc3e7f49f 100644 - 73,110,118,97,108,105,100,97,116,101,32,116,104,101,32,100, - 105,114,101,99,116,111,114,121,32,109,116,105,109,101,46,114, - 129,0,0,0,78,41,1,114,87,1,0,0,114,13,1,0, +- 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, +- 114,69,1,0,0,195,5,0,0,115,2,0,0,0,0,2, +- 122,28,70,105,108,101,70,105,110,100,101,114,46,105,110,118, +- 97,108,105,100,97,116,101,95,99,97,99,104,101,115,99,2, +- 0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,3, +- 0,0,0,67,0,0,0,115,42,0,0,0,124,0,160,0, +- 124,1,161,1,125,2,124,2,100,1,107,8,114,26,100,1, +- 103,0,102,2,83,0,124,2,106,1,124,2,106,2,112,38, +- 103,0,102,2,83,0,41,2,122,197,84,114,121,32,116,111, +- 32,102,105,110,100,32,97,32,108,111,97,100,101,114,32,102, +- 111,114,32,116,104,101,32,115,112,101,99,105,102,105,101,100, +- 32,109,111,100,117,108,101,44,32,111,114,32,116,104,101,32, +- 110,97,109,101,115,112,97,99,101,10,32,32,32,32,32,32, +- 32,32,112,97,99,107,97,103,101,32,112,111,114,116,105,111, +- 110,115,46,32,82,101,116,117,114,110,115,32,40,108,111,97, +- 100,101,114,44,32,108,105,115,116,45,111,102,45,112,111,114, +- 116,105,111,110,115,41,46,10,10,32,32,32,32,32,32,32, +- 32,84,104,105,115,32,109,101,116,104,111,100,32,105,115,32, +- 100,101,112,114,101,99,97,116,101,100,46,32,32,85,115,101, +- 32,102,105,110,100,95,115,112,101,99,40,41,32,105,110,115, +- 116,101,97,100,46,10,10,32,32,32,32,32,32,32,32,78, +- 41,3,114,226,0,0,0,114,164,0,0,0,114,202,0,0, +- 0,41,3,114,142,0,0,0,114,163,0,0,0,114,210,0, +- 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, +- 0,114,161,0,0,0,201,5,0,0,115,8,0,0,0,0, +- 7,10,1,8,1,8,1,122,22,70,105,108,101,70,105,110, +- 100,101,114,46,102,105,110,100,95,108,111,97,100,101,114,99, +- 6,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0, +- 6,0,0,0,67,0,0,0,115,26,0,0,0,124,1,124, +- 2,124,3,131,2,125,6,116,0,124,2,124,3,124,6,124, +- 4,100,1,141,4,83,0,41,2,78,114,201,0,0,0,41, +- 1,114,213,0,0,0,41,7,114,142,0,0,0,114,211,0, +- 0,0,114,163,0,0,0,114,64,0,0,0,90,4,115,109, +- 115,108,114,225,0,0,0,114,164,0,0,0,114,10,0,0, +- 0,114,10,0,0,0,114,11,0,0,0,114,81,1,0,0, +- 213,5,0,0,115,8,0,0,0,0,1,10,1,8,1,2, +- 255,122,20,70,105,108,101,70,105,110,100,101,114,46,95,103, +- 101,116,95,115,112,101,99,78,99,3,0,0,0,0,0,0, +- 0,0,0,0,0,14,0,0,0,9,0,0,0,67,0,0, +- 0,115,130,1,0,0,100,1,125,3,124,1,160,0,100,2, +- 161,1,100,3,25,0,125,4,122,24,116,1,124,0,106,2, +- 112,34,116,3,160,4,161,0,131,1,106,5,125,5,87,0, +- 110,24,4,0,116,6,107,10,114,66,1,0,1,0,1,0, +- 100,4,125,5,89,0,110,2,88,0,124,5,124,0,106,7, +- 107,3,114,92,124,0,160,8,161,0,1,0,124,5,124,0, +- 95,7,116,9,131,0,114,114,124,0,106,10,125,6,124,4, +- 160,11,161,0,125,7,110,10,124,0,106,12,125,6,124,4, +- 125,7,124,7,124,6,107,6,114,218,116,13,124,0,106,2, +- 124,4,131,2,125,8,124,0,106,14,68,0,93,58,92,2, +- 125,9,125,10,100,5,124,9,23,0,125,11,116,13,124,8, +- 124,11,131,2,125,12,116,15,124,12,131,1,114,150,124,0, +- 160,16,124,10,124,1,124,12,124,8,103,1,124,2,161,5, +- 2,0,1,0,83,0,113,150,116,17,124,8,131,1,125,3, +- 124,0,106,14,68,0,93,114,92,2,125,9,125,10,122,20, +- 116,13,124,0,106,2,124,4,124,9,23,0,131,2,125,12, +- 87,0,110,26,4,0,116,18,107,10,144,1,114,22,1,0, +- 1,0,1,0,89,0,1,0,100,6,83,0,88,0,116,19, +- 106,20,100,7,124,12,100,3,100,8,141,3,1,0,124,7, +- 124,9,23,0,124,6,107,6,114,224,116,15,124,12,131,1, +- 114,224,124,0,160,16,124,10,124,1,124,12,100,6,124,2, +- 161,5,2,0,1,0,83,0,113,224,124,3,144,1,114,126, +- 116,19,160,20,100,9,124,8,161,2,1,0,116,19,160,21, +- 124,1,100,6,161,2,125,13,124,8,103,1,124,13,95,22, +- 124,13,83,0,100,6,83,0,41,10,122,111,84,114,121,32, +- 116,111,32,102,105,110,100,32,97,32,115,112,101,99,32,102, +- 111,114,32,116,104,101,32,115,112,101,99,105,102,105,101,100, +- 32,109,111,100,117,108,101,46,10,10,32,32,32,32,32,32, +- 32,32,82,101,116,117,114,110,115,32,116,104,101,32,109,97, +- 116,99,104,105,110,103,32,115,112,101,99,44,32,111,114,32, +- 78,111,110,101,32,105,102,32,110,111,116,32,102,111,117,110, +- 100,46,10,32,32,32,32,32,32,32,32,70,114,95,0,0, +- 0,114,44,0,0,0,114,129,0,0,0,114,232,0,0,0, +- 78,122,9,116,114,121,105,110,103,32,123,125,41,1,90,9, +- 118,101,114,98,111,115,105,116,121,122,25,112,111,115,115,105, +- 98,108,101,32,110,97,109,101,115,112,97,99,101,32,102,111, +- 114,32,123,125,41,23,114,102,0,0,0,114,74,0,0,0, +- 114,64,0,0,0,114,21,0,0,0,114,80,0,0,0,114, +- 33,1,0,0,114,75,0,0,0,114,87,1,0,0,218,11, +- 95,102,105,108,108,95,99,97,99,104,101,114,24,0,0,0, +- 114,90,1,0,0,114,130,0,0,0,114,89,1,0,0,114, +- 66,0,0,0,114,86,1,0,0,114,79,0,0,0,114,81, +- 1,0,0,114,81,0,0,0,114,110,0,0,0,114,158,0, +- 0,0,114,173,0,0,0,114,207,0,0,0,114,202,0,0, +- 0,41,14,114,142,0,0,0,114,163,0,0,0,114,225,0, +- 0,0,90,12,105,115,95,110,97,109,101,115,112,97,99,101, +- 90,11,116,97,105,108,95,109,111,100,117,108,101,114,193,0, +- 0,0,90,5,99,97,99,104,101,90,12,99,97,99,104,101, +- 95,109,111,100,117,108,101,90,9,98,97,115,101,95,112,97, +- 116,104,114,41,1,0,0,114,211,0,0,0,90,13,105,110, +- 105,116,95,102,105,108,101,110,97,109,101,90,9,102,117,108, +- 108,95,112,97,116,104,114,210,0,0,0,114,10,0,0,0, +- 114,10,0,0,0,114,11,0,0,0,114,226,0,0,0,218, +- 5,0,0,115,80,0,0,0,0,5,4,1,14,1,2,1, +- 24,1,14,1,10,1,10,1,8,1,6,2,6,1,6,1, +- 10,2,6,1,4,2,8,1,12,1,14,1,8,1,10,1, +- 8,1,26,4,8,2,14,1,2,1,20,1,16,1,10,1, +- 16,1,12,1,8,1,10,1,2,0,2,255,10,2,6,1, +- 12,1,12,1,8,1,4,1,122,20,70,105,108,101,70,105, +- 110,100,101,114,46,102,105,110,100,95,115,112,101,99,99,1, +- 0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,10, +- 0,0,0,67,0,0,0,115,190,0,0,0,124,0,106,0, +- 125,1,122,22,116,1,160,2,124,1,112,22,116,1,160,3, +- 161,0,161,1,125,2,87,0,110,30,4,0,116,4,116,5, +- 116,6,102,3,107,10,114,58,1,0,1,0,1,0,103,0, +- 125,2,89,0,110,2,88,0,116,7,106,8,160,9,100,1, +- 161,1,115,84,116,10,124,2,131,1,124,0,95,11,110,74, +- 116,10,131,0,125,3,124,2,68,0,93,56,125,4,124,4, +- 160,12,100,2,161,1,92,3,125,5,125,6,125,7,124,6, +- 114,136,100,3,160,13,124,5,124,7,160,14,161,0,161,2, +- 125,8,110,4,124,5,125,8,124,3,160,15,124,8,161,1, +- 1,0,113,94,124,3,124,0,95,11,116,7,106,8,160,9, +- 116,16,161,1,114,186,100,4,100,5,132,0,124,2,68,0, +- 131,1,124,0,95,17,100,6,83,0,41,7,122,68,70,105, +- 108,108,32,116,104,101,32,99,97,99,104,101,32,111,102,32, +- 112,111,116,101,110,116,105,97,108,32,109,111,100,117,108,101, +- 115,32,97,110,100,32,112,97,99,107,97,103,101,115,32,102, +- 111,114,32,116,104,105,115,32,100,105,114,101,99,116,111,114, +- 121,46,114,19,0,0,0,114,95,0,0,0,114,86,0,0, +- 0,99,1,0,0,0,0,0,0,0,0,0,0,0,2,0, +- 0,0,4,0,0,0,83,0,0,0,115,20,0,0,0,104, +- 0,124,0,93,12,125,1,124,1,160,0,161,0,146,2,113, +- 4,83,0,114,10,0,0,0,41,1,114,130,0,0,0,41, +- 2,114,8,0,0,0,90,2,102,110,114,10,0,0,0,114, +- 10,0,0,0,114,11,0,0,0,114,18,0,0,0,42,6, +- 0,0,115,4,0,0,0,6,0,2,0,122,41,70,105,108, +- 101,70,105,110,100,101,114,46,95,102,105,108,108,95,99,97, +- 99,104,101,46,60,108,111,99,97,108,115,62,46,60,115,101, +- 116,99,111,109,112,62,78,41,18,114,64,0,0,0,114,21, +- 0,0,0,114,30,1,0,0,114,80,0,0,0,114,26,1, +- 0,0,218,15,80,101,114,109,105,115,115,105,111,110,69,114, +- 114,111,114,218,18,78,111,116,65,68,105,114,101,99,116,111, +- 114,121,69,114,114,111,114,114,25,0,0,0,114,26,0,0, +- 0,114,27,0,0,0,114,88,1,0,0,114,89,1,0,0, +- 114,125,0,0,0,114,87,0,0,0,114,130,0,0,0,218, +- 3,97,100,100,114,28,0,0,0,114,90,1,0,0,41,9, +- 114,142,0,0,0,114,64,0,0,0,114,31,1,0,0,90, +- 21,108,111,119,101,114,95,115,117,102,102,105,120,95,99,111, +- 110,116,101,110,116,115,114,64,1,0,0,114,140,0,0,0, +- 114,52,1,0,0,114,41,1,0,0,90,8,110,101,119,95, +- 110,97,109,101,114,10,0,0,0,114,10,0,0,0,114,11, +- 0,0,0,114,92,1,0,0,13,6,0,0,115,34,0,0, +- 0,0,2,6,1,2,1,22,1,20,3,10,3,12,1,12, +- 7,6,1,8,1,16,1,4,1,18,2,4,1,12,1,6, +- 1,12,1,122,22,70,105,108,101,70,105,110,100,101,114,46, +- 95,102,105,108,108,95,99,97,99,104,101,99,1,0,0,0, +- 0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0, +- 7,0,0,0,115,18,0,0,0,135,0,135,1,102,2,100, +- 1,100,2,132,8,125,2,124,2,83,0,41,3,97,20,1, +- 0,0,65,32,99,108,97,115,115,32,109,101,116,104,111,100, +- 32,119,104,105,99,104,32,114,101,116,117,114,110,115,32,97, +- 32,99,108,111,115,117,114,101,32,116,111,32,117,115,101,32, + 85,115,101,32,101,120,101,99,95,109,111,100,117,108,101,40, + 41,32,105,110,115,116,101,97,100,46,10,10,32,32,32,32, + 32,32,32,32,122,38,110,97,109,101,115,112,97,99,101,32, @@ -7614,7 +7764,57 @@ index 8e0650a7dc..4fc3e7f49f 100644 + 121,115,46,112,97,116,104,32,111,114,32,39,112,97,116,104, + 39,46,10,10,32,32,32,32,32,32,32,32,84,104,101,32, + 115,101,97,114,99,104,32,105,115,32,98,97,115,101,100,32, -+ 111,110,32,115,121,115,46,112,97,116,104,95,104,111,111,107, + 111,110,32,115,121,115,46,112,97,116,104,95,104,111,111,107, +- 10,32,32,32,32,32,32,32,32,119,104,105,99,104,32,119, +- 105,108,108,32,114,101,116,117,114,110,32,97,110,32,105,110, +- 115,116,97,110,99,101,32,117,115,105,110,103,32,116,104,101, +- 32,115,112,101,99,105,102,105,101,100,32,108,111,97,100,101, +- 114,115,32,97,110,100,32,116,104,101,32,112,97,116,104,10, +- 32,32,32,32,32,32,32,32,99,97,108,108,101,100,32,111, +- 110,32,116,104,101,32,99,108,111,115,117,114,101,46,10,10, +- 32,32,32,32,32,32,32,32,73,102,32,116,104,101,32,112, +- 97,116,104,32,99,97,108,108,101,100,32,111,110,32,116,104, +- 101,32,99,108,111,115,117,114,101,32,105,115,32,110,111,116, +- 32,97,32,100,105,114,101,99,116,111,114,121,44,32,73,109, +- 112,111,114,116,69,114,114,111,114,32,105,115,10,32,32,32, +- 32,32,32,32,32,114,97,105,115,101,100,46,10,10,32,32, +- 32,32,32,32,32,32,99,1,0,0,0,0,0,0,0,0, +- 0,0,0,1,0,0,0,4,0,0,0,19,0,0,0,115, +- 34,0,0,0,116,0,124,0,131,1,115,20,116,1,100,1, +- 124,0,100,2,141,2,130,1,136,0,124,0,102,1,136,1, +- 158,2,142,0,83,0,41,3,122,45,80,97,116,104,32,104, +- 111,111,107,32,102,111,114,32,105,109,112,111,114,116,108,105, +- 98,46,109,97,99,104,105,110,101,114,121,46,70,105,108,101, +- 70,105,110,100,101,114,46,122,30,111,110,108,121,32,100,105, +- 114,101,99,116,111,114,105,101,115,32,97,114,101,32,115,117, +- 112,112,111,114,116,101,100,114,70,0,0,0,41,2,114,81, +- 0,0,0,114,141,0,0,0,114,70,0,0,0,169,2,114, +- 216,0,0,0,114,91,1,0,0,114,10,0,0,0,114,11, +- 0,0,0,218,24,112,97,116,104,95,104,111,111,107,95,102, +- 111,114,95,70,105,108,101,70,105,110,100,101,114,54,6,0, +- 0,115,6,0,0,0,0,2,8,1,12,1,122,54,70,105, +- 108,101,70,105,110,100,101,114,46,112,97,116,104,95,104,111, +- 111,107,46,60,108,111,99,97,108,115,62,46,112,97,116,104, +- 95,104,111,111,107,95,102,111,114,95,70,105,108,101,70,105, +- 110,100,101,114,114,10,0,0,0,41,3,114,216,0,0,0, +- 114,91,1,0,0,114,97,1,0,0,114,10,0,0,0,114, +- 96,1,0,0,114,11,0,0,0,218,9,112,97,116,104,95, +- 104,111,111,107,44,6,0,0,115,4,0,0,0,0,10,14, +- 6,122,20,70,105,108,101,70,105,110,100,101,114,46,112,97, +- 116,104,95,104,111,111,107,99,1,0,0,0,0,0,0,0, +- 0,0,0,0,1,0,0,0,3,0,0,0,67,0,0,0, +- 115,12,0,0,0,100,1,160,0,124,0,106,1,161,1,83, +- 0,41,2,78,122,16,70,105,108,101,70,105,110,100,101,114, +- 40,123,33,114,125,41,41,2,114,87,0,0,0,114,64,0, +- 0,0,114,13,1,0,0,114,10,0,0,0,114,10,0,0, +- 0,114,11,0,0,0,114,62,1,0,0,62,6,0,0,115, +- 2,0,0,0,0,1,122,19,70,105,108,101,70,105,110,100, +- 101,114,46,95,95,114,101,112,114,95,95,41,1,78,41,15, +- 114,149,0,0,0,114,148,0,0,0,114,150,0,0,0,114, +- 151,0,0,0,114,232,0,0,0,114,69,1,0,0,114,167, +- 0,0,0,114,229,0,0,0,114,161,0,0,0,114,81,1, +- 0,0,114,226,0,0,0,114,92,1,0,0,114,230,0,0, +- 0,114,98,1,0,0,114,62,1,0,0,114,10,0,0,0, + 115,32,97,110,100,32,115,121,115,46,112,97,116,104,95,105, + 109,112,111,114,116,101,114,95,99,97,99,104,101,46,10,32, + 32,32,32,32,32,32,32,78,41,7,114,28,0,0,0,114, @@ -8080,347 +8280,29 @@ index 8e0650a7dc..4fc3e7f49f 100644 + 0,67,0,0,0,115,10,0,0,0,124,1,124,0,95,0, + 100,0,83,0,114,71,0,0,0,41,1,218,15,102,114,97, + 109,101,119,111,114,107,115,95,112,97,116,104,114,249,0,0, - 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, -- 114,69,1,0,0,195,5,0,0,115,2,0,0,0,0,2, -- 122,28,70,105,108,101,70,105,110,100,101,114,46,105,110,118, -- 97,108,105,100,97,116,101,95,99,97,99,104,101,115,99,2, -- 0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,3, -- 0,0,0,67,0,0,0,115,42,0,0,0,124,0,160,0, -- 124,1,161,1,125,2,124,2,100,1,107,8,114,26,100,1, -- 103,0,102,2,83,0,124,2,106,1,124,2,106,2,112,38, -- 103,0,102,2,83,0,41,2,122,197,84,114,121,32,116,111, -- 32,102,105,110,100,32,97,32,108,111,97,100,101,114,32,102, -- 111,114,32,116,104,101,32,115,112,101,99,105,102,105,101,100, -- 32,109,111,100,117,108,101,44,32,111,114,32,116,104,101,32, -- 110,97,109,101,115,112,97,99,101,10,32,32,32,32,32,32, -- 32,32,112,97,99,107,97,103,101,32,112,111,114,116,105,111, -- 110,115,46,32,82,101,116,117,114,110,115,32,40,108,111,97, -- 100,101,114,44,32,108,105,115,116,45,111,102,45,112,111,114, -- 116,105,111,110,115,41,46,10,10,32,32,32,32,32,32,32, -- 32,84,104,105,115,32,109,101,116,104,111,100,32,105,115,32, -- 100,101,112,114,101,99,97,116,101,100,46,32,32,85,115,101, -- 32,102,105,110,100,95,115,112,101,99,40,41,32,105,110,115, -- 116,101,97,100,46,10,10,32,32,32,32,32,32,32,32,78, -- 41,3,114,226,0,0,0,114,164,0,0,0,114,202,0,0, -- 0,41,3,114,142,0,0,0,114,163,0,0,0,114,210,0, ++ 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, + 114,236,0,0,0,104,6,0,0,115,2,0,0,0,0,1, + 122,29,65,112,112,108,101,70,114,97,109,101,119,111,114,107, + 70,105,110,100,101,114,46,95,95,105,110,105,116,95,95,78, -+ 99,4,0,0,0,0,0,0,0,0,0,0,0,9,0,0, -+ 0,6,0,0,0,67,0,0,0,115,120,0,0,0,124,1, -+ 160,0,100,1,161,1,100,2,25,0,125,4,100,3,160,1, -+ 124,1,160,0,100,1,161,1,161,1,125,5,116,2,68,0, -+ 93,80,125,6,116,3,124,0,106,4,124,5,155,0,100,4, -+ 157,2,124,4,155,0,124,6,155,0,157,2,131,3,125,7, -+ 116,5,160,6,100,5,124,7,161,2,1,0,116,7,124,7, -+ 131,1,114,34,116,8,124,1,124,7,124,2,131,3,125,8, -+ 116,5,160,9,124,1,124,8,161,2,2,0,1,0,83,0, -+ 113,34,100,0,83,0,41,6,78,114,98,0,0,0,114,132, -+ 0,0,0,114,135,0,0,0,122,10,46,102,114,97,109,101, -+ 119,111,114,107,122,36,76,111,111,107,105,110,103,32,102,111, -+ 114,32,65,112,112,108,101,32,70,114,97,109,101,119,111,114, -+ 107,32,100,121,108,105,98,32,123,125,41,10,218,5,115,112, -+ 108,105,116,114,64,0,0,0,114,49,1,0,0,114,69,0, -+ 0,0,114,110,1,0,0,114,162,0,0,0,114,177,0,0, -+ 0,114,82,0,0,0,114,105,1,0,0,114,228,0,0,0, -+ 41,9,114,146,0,0,0,114,167,0,0,0,114,67,0,0, -+ 0,114,229,0,0,0,114,144,0,0,0,90,14,102,114,97, -+ 109,101,119,111,114,107,95,110,97,109,101,114,136,0,0,0, -+ 114,107,1,0,0,114,168,0,0,0,114,10,0,0,0,114, -+ 10,0,0,0,114,11,0,0,0,114,230,0,0,0,107,6, -+ 0,0,115,18,0,0,0,0,1,14,1,16,2,8,1,28, -+ 1,12,1,8,1,12,1,18,2,122,30,65,112,112,108,101, -+ 70,114,97,109,101,119,111,114,107,70,105,110,100,101,114,46, -+ 102,105,110,100,95,115,112,101,99,41,1,78,41,6,114,153, -+ 0,0,0,114,152,0,0,0,114,154,0,0,0,114,155,0, -+ 0,0,114,236,0,0,0,114,230,0,0,0,114,10,0,0, -+ 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, -+ 114,109,1,0,0,98,6,0,0,115,6,0,0,0,8,1, -+ 4,5,8,3,114,109,1,0,0,99,4,0,0,0,0,0, -+ 0,0,0,0,0,0,6,0,0,0,8,0,0,0,67,0, -+ 0,0,115,146,0,0,0,124,0,160,0,100,1,161,1,125, -+ 4,124,0,160,0,100,2,161,1,125,5,124,4,115,66,124, -+ 5,114,36,124,5,106,1,125,4,110,30,124,2,124,3,107, -+ 2,114,56,116,2,124,1,124,2,131,2,125,4,110,10,116, -+ 3,124,1,124,2,131,2,125,4,124,5,115,84,116,4,124, -+ 1,124,2,124,4,100,3,141,3,125,5,122,36,124,5,124, -+ 0,100,2,60,0,124,4,124,0,100,1,60,0,124,2,124, -+ 0,100,4,60,0,124,3,124,0,100,5,60,0,87,0,110, -+ 20,4,0,116,5,107,10,114,140,1,0,1,0,1,0,89, -+ 0,110,2,88,0,100,0,83,0,41,6,78,218,10,95,95, -+ 108,111,97,100,101,114,95,95,218,8,95,95,115,112,101,99, -+ 95,95,114,91,1,0,0,114,108,1,0,0,90,10,95,95, -+ 99,97,99,104,101,100,95,95,41,6,218,3,103,101,116,114, -+ 168,0,0,0,114,44,1,0,0,114,37,1,0,0,114,217, -+ 0,0,0,218,9,69,120,99,101,112,116,105,111,110,41,6, -+ 90,2,110,115,114,144,0,0,0,90,8,112,97,116,104,110, -+ 97,109,101,90,9,99,112,97,116,104,110,97,109,101,114,168, -+ 0,0,0,114,214,0,0,0,114,10,0,0,0,114,10,0, -+ 0,0,114,11,0,0,0,218,14,95,102,105,120,95,117,112, -+ 95,109,111,100,117,108,101,122,6,0,0,115,34,0,0,0, -+ 0,2,10,1,10,1,4,1,4,1,8,1,8,1,12,2, -+ 10,1,4,1,14,1,2,1,8,1,8,1,8,1,12,1, -+ 14,2,114,116,1,0,0,99,0,0,0,0,0,0,0,0, -+ 0,0,0,0,3,0,0,0,3,0,0,0,67,0,0,0, -+ 115,38,0,0,0,116,0,116,1,160,2,161,0,102,2,125, -+ 0,116,3,116,4,102,2,125,1,116,5,116,6,102,2,125, -+ 2,124,0,124,1,124,2,103,3,83,0,41,1,122,95,82, -+ 101,116,117,114,110,115,32,97,32,108,105,115,116,32,111,102, -+ 32,102,105,108,101,45,98,97,115,101,100,32,109,111,100,117, -+ 108,101,32,108,111,97,100,101,114,115,46,10,10,32,32,32, -+ 32,69,97,99,104,32,105,116,101,109,32,105,115,32,97,32, -+ 116,117,112,108,101,32,40,108,111,97,100,101,114,44,32,115, -+ 117,102,102,105,120,101,115,41,46,10,32,32,32,32,41,7, -+ 114,23,1,0,0,114,191,0,0,0,218,18,101,120,116,101, -+ 110,115,105,111,110,95,115,117,102,102,105,120,101,115,114,37, -+ 1,0,0,114,129,0,0,0,114,44,1,0,0,114,115,0, -+ 0,0,41,3,90,10,101,120,116,101,110,115,105,111,110,115, -+ 90,6,115,111,117,114,99,101,90,8,98,121,116,101,99,111, -+ 100,101,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -+ 0,114,212,0,0,0,145,6,0,0,115,8,0,0,0,0, -+ 5,12,1,8,1,8,1,114,212,0,0,0,99,1,0,0, -+ 0,0,0,0,0,0,0,0,0,12,0,0,0,9,0,0, -+ 0,67,0,0,0,115,178,1,0,0,124,0,97,0,116,0, -+ 106,1,97,1,116,0,106,2,97,2,116,1,106,3,116,4, -+ 25,0,125,1,100,1,68,0,93,48,125,2,124,2,116,1, -+ 106,3,107,7,114,56,116,0,160,5,124,2,161,1,125,3, -+ 110,10,116,1,106,3,124,2,25,0,125,3,116,6,124,1, -+ 124,2,124,3,131,3,1,0,113,30,100,2,100,3,103,1, -+ 102,2,100,4,100,5,100,3,103,2,102,2,102,2,125,4, -+ 124,4,68,0,93,110,92,2,125,5,125,6,116,7,100,6, -+ 100,7,132,0,124,6,68,0,131,1,131,1,115,136,116,8, -+ 130,1,124,6,100,8,25,0,125,7,124,5,116,1,106,3, -+ 107,6,114,170,116,1,106,3,124,5,25,0,125,8,1,0, -+ 113,226,113,106,122,20,116,0,160,5,124,5,161,1,125,8, -+ 87,0,1,0,113,226,87,0,113,106,4,0,116,9,107,10, -+ 114,214,1,0,1,0,1,0,89,0,113,106,89,0,113,106, -+ 88,0,113,106,116,9,100,9,131,1,130,1,116,6,124,1, -+ 100,10,124,8,131,3,1,0,116,6,124,1,100,11,124,7, -+ 131,3,1,0,116,6,124,1,100,12,100,13,160,10,124,6, -+ 161,1,131,3,1,0,116,6,124,1,100,14,100,15,100,16, -+ 132,0,124,6,68,0,131,1,131,3,1,0,116,0,160,5, -+ 100,17,161,1,125,9,116,6,124,1,100,17,124,9,131,3, -+ 1,0,116,0,160,5,100,18,161,1,125,10,116,6,124,1, -+ 100,18,124,10,131,3,1,0,124,5,100,4,107,2,144,1, -+ 114,110,116,0,160,5,100,19,161,1,125,11,116,6,124,1, -+ 100,20,124,11,131,3,1,0,116,6,124,1,100,21,116,11, -+ 131,0,131,3,1,0,116,12,160,13,116,2,160,14,161,0, -+ 161,1,1,0,124,5,100,4,107,2,144,1,114,174,116,15, -+ 160,16,100,22,161,1,1,0,100,23,116,12,107,6,144,1, -+ 114,174,100,24,116,17,95,18,100,25,83,0,41,26,122,205, -+ 83,101,116,117,112,32,116,104,101,32,112,97,116,104,45,98, -+ 97,115,101,100,32,105,109,112,111,114,116,101,114,115,32,102, -+ 111,114,32,105,109,112,111,114,116,108,105,98,32,98,121,32, -+ 105,109,112,111,114,116,105,110,103,32,110,101,101,100,101,100, -+ 10,32,32,32,32,98,117,105,108,116,45,105,110,32,109,111, -+ 100,117,108,101,115,32,97,110,100,32,105,110,106,101,99,116, -+ 105,110,103,32,116,104,101,109,32,105,110,116,111,32,116,104, -+ 101,32,103,108,111,98,97,108,32,110,97,109,101,115,112,97, -+ 99,101,46,10,10,32,32,32,32,79,116,104,101,114,32,99, -+ 111,109,112,111,110,101,110,116,115,32,97,114,101,32,101,120, -+ 116,114,97,99,116,101,100,32,102,114,111,109,32,116,104,101, -+ 32,99,111,114,101,32,98,111,111,116,115,116,114,97,112,32, -+ 109,111,100,117,108,101,46,10,10,32,32,32,32,41,4,114, -+ 92,0,0,0,114,100,0,0,0,218,8,98,117,105,108,116, -+ 105,110,115,114,188,0,0,0,218,5,112,111,115,105,120,114, -+ 2,0,0,0,218,2,110,116,114,1,0,0,0,99,1,0, -+ 0,0,0,0,0,0,0,0,0,0,2,0,0,0,3,0, -+ 0,0,115,0,0,0,115,26,0,0,0,124,0,93,18,125, -+ 1,116,0,124,1,131,1,100,0,107,2,86,0,1,0,113, -+ 2,100,1,83,0,114,3,0,0,0,114,5,0,0,0,114, -+ 7,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, -+ 0,0,0,114,12,0,0,0,181,6,0,0,115,4,0,0, -+ 0,4,0,2,0,122,25,95,115,101,116,117,112,46,60,108, -+ 111,99,97,108,115,62,46,60,103,101,110,101,120,112,114,62, -+ 114,0,0,0,0,122,30,105,109,112,111,114,116,108,105,98, -+ 32,114,101,113,117,105,114,101,115,32,112,111,115,105,120,32, -+ 111,114,32,110,116,114,24,0,0,0,114,61,0,0,0,114, -+ 52,0,0,0,114,13,0,0,0,218,20,95,112,97,116,104, -+ 115,101,112,115,95,119,105,116,104,95,99,111,108,111,110,99, -+ 1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0, -+ 4,0,0,0,83,0,0,0,115,22,0,0,0,104,0,124, -+ 0,93,14,125,1,100,0,124,1,155,0,157,2,146,2,113, -+ 4,83,0,114,14,0,0,0,114,10,0,0,0,114,16,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, -- 0,114,161,0,0,0,201,5,0,0,115,8,0,0,0,0, -- 7,10,1,8,1,8,1,122,22,70,105,108,101,70,105,110, -- 100,101,114,46,102,105,110,100,95,108,111,97,100,101,114,99, -- 6,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0, -- 6,0,0,0,67,0,0,0,115,26,0,0,0,124,1,124, -- 2,124,3,131,2,125,6,116,0,124,2,124,3,124,6,124, -- 4,100,1,141,4,83,0,41,2,78,114,201,0,0,0,41, -- 1,114,213,0,0,0,41,7,114,142,0,0,0,114,211,0, -- 0,0,114,163,0,0,0,114,64,0,0,0,90,4,115,109, -- 115,108,114,225,0,0,0,114,164,0,0,0,114,10,0,0, -- 0,114,10,0,0,0,114,11,0,0,0,114,81,1,0,0, -- 213,5,0,0,115,8,0,0,0,0,1,10,1,8,1,2, -- 255,122,20,70,105,108,101,70,105,110,100,101,114,46,95,103, -- 101,116,95,115,112,101,99,78,99,3,0,0,0,0,0,0, -- 0,0,0,0,0,14,0,0,0,9,0,0,0,67,0,0, -- 0,115,130,1,0,0,100,1,125,3,124,1,160,0,100,2, -- 161,1,100,3,25,0,125,4,122,24,116,1,124,0,106,2, -- 112,34,116,3,160,4,161,0,131,1,106,5,125,5,87,0, -- 110,24,4,0,116,6,107,10,114,66,1,0,1,0,1,0, -- 100,4,125,5,89,0,110,2,88,0,124,5,124,0,106,7, -- 107,3,114,92,124,0,160,8,161,0,1,0,124,5,124,0, -- 95,7,116,9,131,0,114,114,124,0,106,10,125,6,124,4, -- 160,11,161,0,125,7,110,10,124,0,106,12,125,6,124,4, -- 125,7,124,7,124,6,107,6,114,218,116,13,124,0,106,2, -- 124,4,131,2,125,8,124,0,106,14,68,0,93,58,92,2, -- 125,9,125,10,100,5,124,9,23,0,125,11,116,13,124,8, -- 124,11,131,2,125,12,116,15,124,12,131,1,114,150,124,0, -- 160,16,124,10,124,1,124,12,124,8,103,1,124,2,161,5, -- 2,0,1,0,83,0,113,150,116,17,124,8,131,1,125,3, -- 124,0,106,14,68,0,93,114,92,2,125,9,125,10,122,20, -- 116,13,124,0,106,2,124,4,124,9,23,0,131,2,125,12, -- 87,0,110,26,4,0,116,18,107,10,144,1,114,22,1,0, -- 1,0,1,0,89,0,1,0,100,6,83,0,88,0,116,19, -- 106,20,100,7,124,12,100,3,100,8,141,3,1,0,124,7, -- 124,9,23,0,124,6,107,6,114,224,116,15,124,12,131,1, -- 114,224,124,0,160,16,124,10,124,1,124,12,100,6,124,2, -- 161,5,2,0,1,0,83,0,113,224,124,3,144,1,114,126, -- 116,19,160,20,100,9,124,8,161,2,1,0,116,19,160,21, -- 124,1,100,6,161,2,125,13,124,8,103,1,124,13,95,22, -- 124,13,83,0,100,6,83,0,41,10,122,111,84,114,121,32, -- 116,111,32,102,105,110,100,32,97,32,115,112,101,99,32,102, -- 111,114,32,116,104,101,32,115,112,101,99,105,102,105,101,100, -- 32,109,111,100,117,108,101,46,10,10,32,32,32,32,32,32, -- 32,32,82,101,116,117,114,110,115,32,116,104,101,32,109,97, -- 116,99,104,105,110,103,32,115,112,101,99,44,32,111,114,32, -- 78,111,110,101,32,105,102,32,110,111,116,32,102,111,117,110, -- 100,46,10,32,32,32,32,32,32,32,32,70,114,95,0,0, -- 0,114,44,0,0,0,114,129,0,0,0,114,232,0,0,0, -- 78,122,9,116,114,121,105,110,103,32,123,125,41,1,90,9, -- 118,101,114,98,111,115,105,116,121,122,25,112,111,115,115,105, -- 98,108,101,32,110,97,109,101,115,112,97,99,101,32,102,111, -- 114,32,123,125,41,23,114,102,0,0,0,114,74,0,0,0, -- 114,64,0,0,0,114,21,0,0,0,114,80,0,0,0,114, -- 33,1,0,0,114,75,0,0,0,114,87,1,0,0,218,11, -- 95,102,105,108,108,95,99,97,99,104,101,114,24,0,0,0, -- 114,90,1,0,0,114,130,0,0,0,114,89,1,0,0,114, -- 66,0,0,0,114,86,1,0,0,114,79,0,0,0,114,81, -- 1,0,0,114,81,0,0,0,114,110,0,0,0,114,158,0, -- 0,0,114,173,0,0,0,114,207,0,0,0,114,202,0,0, -- 0,41,14,114,142,0,0,0,114,163,0,0,0,114,225,0, -- 0,0,90,12,105,115,95,110,97,109,101,115,112,97,99,101, -- 90,11,116,97,105,108,95,109,111,100,117,108,101,114,193,0, -- 0,0,90,5,99,97,99,104,101,90,12,99,97,99,104,101, -- 95,109,111,100,117,108,101,90,9,98,97,115,101,95,112,97, -- 116,104,114,41,1,0,0,114,211,0,0,0,90,13,105,110, -- 105,116,95,102,105,108,101,110,97,109,101,90,9,102,117,108, -- 108,95,112,97,116,104,114,210,0,0,0,114,10,0,0,0, -- 114,10,0,0,0,114,11,0,0,0,114,226,0,0,0,218, -- 5,0,0,115,80,0,0,0,0,5,4,1,14,1,2,1, -- 24,1,14,1,10,1,10,1,8,1,6,2,6,1,6,1, -- 10,2,6,1,4,2,8,1,12,1,14,1,8,1,10,1, -- 8,1,26,4,8,2,14,1,2,1,20,1,16,1,10,1, -- 16,1,12,1,8,1,10,1,2,0,2,255,10,2,6,1, -- 12,1,12,1,8,1,4,1,122,20,70,105,108,101,70,105, -- 110,100,101,114,46,102,105,110,100,95,115,112,101,99,99,1, -- 0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,10, -- 0,0,0,67,0,0,0,115,190,0,0,0,124,0,106,0, -- 125,1,122,22,116,1,160,2,124,1,112,22,116,1,160,3, -- 161,0,161,1,125,2,87,0,110,30,4,0,116,4,116,5, -- 116,6,102,3,107,10,114,58,1,0,1,0,1,0,103,0, -- 125,2,89,0,110,2,88,0,116,7,106,8,160,9,100,1, -- 161,1,115,84,116,10,124,2,131,1,124,0,95,11,110,74, -- 116,10,131,0,125,3,124,2,68,0,93,56,125,4,124,4, -- 160,12,100,2,161,1,92,3,125,5,125,6,125,7,124,6, -- 114,136,100,3,160,13,124,5,124,7,160,14,161,0,161,2, -- 125,8,110,4,124,5,125,8,124,3,160,15,124,8,161,1, -- 1,0,113,94,124,3,124,0,95,11,116,7,106,8,160,9, -- 116,16,161,1,114,186,100,4,100,5,132,0,124,2,68,0, -- 131,1,124,0,95,17,100,6,83,0,41,7,122,68,70,105, -- 108,108,32,116,104,101,32,99,97,99,104,101,32,111,102,32, -- 112,111,116,101,110,116,105,97,108,32,109,111,100,117,108,101, -- 115,32,97,110,100,32,112,97,99,107,97,103,101,115,32,102, -- 111,114,32,116,104,105,115,32,100,105,114,101,99,116,111,114, -- 121,46,114,19,0,0,0,114,95,0,0,0,114,86,0,0, -- 0,99,1,0,0,0,0,0,0,0,0,0,0,0,2,0, -- 0,0,4,0,0,0,83,0,0,0,115,20,0,0,0,104, -- 0,124,0,93,12,125,1,124,1,160,0,161,0,146,2,113, -- 4,83,0,114,10,0,0,0,41,1,114,130,0,0,0,41, -- 2,114,8,0,0,0,90,2,102,110,114,10,0,0,0,114, -- 10,0,0,0,114,11,0,0,0,114,18,0,0,0,42,6, -- 0,0,115,4,0,0,0,6,0,2,0,122,41,70,105,108, -- 101,70,105,110,100,101,114,46,95,102,105,108,108,95,99,97, -- 99,104,101,46,60,108,111,99,97,108,115,62,46,60,115,101, -- 116,99,111,109,112,62,78,41,18,114,64,0,0,0,114,21, -- 0,0,0,114,30,1,0,0,114,80,0,0,0,114,26,1, -- 0,0,218,15,80,101,114,109,105,115,115,105,111,110,69,114, -- 114,111,114,218,18,78,111,116,65,68,105,114,101,99,116,111, -- 114,121,69,114,114,111,114,114,25,0,0,0,114,26,0,0, -- 0,114,27,0,0,0,114,88,1,0,0,114,89,1,0,0, -- 114,125,0,0,0,114,87,0,0,0,114,130,0,0,0,218, -- 3,97,100,100,114,28,0,0,0,114,90,1,0,0,41,9, -- 114,142,0,0,0,114,64,0,0,0,114,31,1,0,0,90, -- 21,108,111,119,101,114,95,115,117,102,102,105,120,95,99,111, -- 110,116,101,110,116,115,114,64,1,0,0,114,140,0,0,0, -- 114,52,1,0,0,114,41,1,0,0,90,8,110,101,119,95, -- 110,97,109,101,114,10,0,0,0,114,10,0,0,0,114,11, -- 0,0,0,114,92,1,0,0,13,6,0,0,115,34,0,0, -- 0,0,2,6,1,2,1,22,1,20,3,10,3,12,1,12, -- 7,6,1,8,1,16,1,4,1,18,2,4,1,12,1,6, -- 1,12,1,122,22,70,105,108,101,70,105,110,100,101,114,46, -- 95,102,105,108,108,95,99,97,99,104,101,99,1,0,0,0, -- 0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0, -- 7,0,0,0,115,18,0,0,0,135,0,135,1,102,2,100, -- 1,100,2,132,8,125,2,124,2,83,0,41,3,97,20,1, -- 0,0,65,32,99,108,97,115,115,32,109,101,116,104,111,100, -- 32,119,104,105,99,104,32,114,101,116,117,114,110,115,32,97, -- 32,99,108,111,115,117,114,101,32,116,111,32,117,115,101,32, -- 111,110,32,115,121,115,46,112,97,116,104,95,104,111,111,107, -- 10,32,32,32,32,32,32,32,32,119,104,105,99,104,32,119, -- 105,108,108,32,114,101,116,117,114,110,32,97,110,32,105,110, -- 115,116,97,110,99,101,32,117,115,105,110,103,32,116,104,101, -- 32,115,112,101,99,105,102,105,101,100,32,108,111,97,100,101, -- 114,115,32,97,110,100,32,116,104,101,32,112,97,116,104,10, -- 32,32,32,32,32,32,32,32,99,97,108,108,101,100,32,111, -- 110,32,116,104,101,32,99,108,111,115,117,114,101,46,10,10, -- 32,32,32,32,32,32,32,32,73,102,32,116,104,101,32,112, -- 97,116,104,32,99,97,108,108,101,100,32,111,110,32,116,104, -- 101,32,99,108,111,115,117,114,101,32,105,115,32,110,111,116, -- 32,97,32,100,105,114,101,99,116,111,114,121,44,32,73,109, -- 112,111,114,116,69,114,114,111,114,32,105,115,10,32,32,32, -- 32,32,32,32,32,114,97,105,115,101,100,46,10,10,32,32, -- 32,32,32,32,32,32,99,1,0,0,0,0,0,0,0,0, -- 0,0,0,1,0,0,0,4,0,0,0,19,0,0,0,115, -- 34,0,0,0,116,0,124,0,131,1,115,20,116,1,100,1, -- 124,0,100,2,141,2,130,1,136,0,124,0,102,1,136,1, -- 158,2,142,0,83,0,41,3,122,45,80,97,116,104,32,104, -- 111,111,107,32,102,111,114,32,105,109,112,111,114,116,108,105, -- 98,46,109,97,99,104,105,110,101,114,121,46,70,105,108,101, -- 70,105,110,100,101,114,46,122,30,111,110,108,121,32,100,105, -- 114,101,99,116,111,114,105,101,115,32,97,114,101,32,115,117, -- 112,112,111,114,116,101,100,114,70,0,0,0,41,2,114,81, -- 0,0,0,114,141,0,0,0,114,70,0,0,0,169,2,114, -- 216,0,0,0,114,91,1,0,0,114,10,0,0,0,114,11, -- 0,0,0,218,24,112,97,116,104,95,104,111,111,107,95,102, -- 111,114,95,70,105,108,101,70,105,110,100,101,114,54,6,0, -- 0,115,6,0,0,0,0,2,8,1,12,1,122,54,70,105, -- 108,101,70,105,110,100,101,114,46,112,97,116,104,95,104,111, -- 111,107,46,60,108,111,99,97,108,115,62,46,112,97,116,104, -- 95,104,111,111,107,95,102,111,114,95,70,105,108,101,70,105, -- 110,100,101,114,114,10,0,0,0,41,3,114,216,0,0,0, -- 114,91,1,0,0,114,97,1,0,0,114,10,0,0,0,114, -- 96,1,0,0,114,11,0,0,0,218,9,112,97,116,104,95, -- 104,111,111,107,44,6,0,0,115,4,0,0,0,0,10,14, -- 6,122,20,70,105,108,101,70,105,110,100,101,114,46,112,97, -- 116,104,95,104,111,111,107,99,1,0,0,0,0,0,0,0, -- 0,0,0,0,1,0,0,0,3,0,0,0,67,0,0,0, -- 115,12,0,0,0,100,1,160,0,124,0,106,1,161,1,83, -- 0,41,2,78,122,16,70,105,108,101,70,105,110,100,101,114, -- 40,123,33,114,125,41,41,2,114,87,0,0,0,114,64,0, -- 0,0,114,13,1,0,0,114,10,0,0,0,114,10,0,0, -- 0,114,11,0,0,0,114,62,1,0,0,62,6,0,0,115, -- 2,0,0,0,0,1,122,19,70,105,108,101,70,105,110,100, -- 101,114,46,95,95,114,101,112,114,95,95,41,1,78,41,15, -- 114,149,0,0,0,114,148,0,0,0,114,150,0,0,0,114, -- 151,0,0,0,114,232,0,0,0,114,69,1,0,0,114,167, -- 0,0,0,114,229,0,0,0,114,161,0,0,0,114,81,1, -- 0,0,114,226,0,0,0,114,92,1,0,0,114,230,0,0, -- 0,114,98,1,0,0,114,62,1,0,0,114,10,0,0,0, -- 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, ++ 99,4,0,0,0,0,0,0,0,0,0,0,0,8,0,0, ++ 0,6,0,0,0,67,0,0,0,115,104,0,0,0,124,1, ++ 160,0,100,1,161,1,100,2,25,0,125,4,116,1,68,0, ++ 93,80,125,5,116,2,124,0,106,3,124,1,155,0,100,3, ++ 157,2,124,4,155,0,124,5,155,0,157,2,131,3,125,6, ++ 116,4,160,5,100,4,124,6,161,2,1,0,116,6,124,6, ++ 131,1,114,18,116,7,124,1,124,6,124,2,131,3,125,7, ++ 116,4,160,8,124,1,124,7,161,2,2,0,1,0,83,0, ++ 113,18,100,0,83,0,41,5,78,114,98,0,0,0,114,132, ++ 0,0,0,122,10,46,102,114,97,109,101,119,111,114,107,122, ++ 36,76,111,111,107,105,110,103,32,102,111,114,32,65,112,112, ++ 108,101,32,70,114,97,109,101,119,111,114,107,32,100,121,108, ++ 105,98,32,123,125,41,9,218,5,115,112,108,105,116,114,49, ++ 1,0,0,114,69,0,0,0,114,110,1,0,0,114,162,0, ++ 0,0,114,177,0,0,0,114,82,0,0,0,114,105,1,0, ++ 0,114,228,0,0,0,41,8,114,146,0,0,0,114,167,0, ++ 0,0,114,67,0,0,0,114,229,0,0,0,114,144,0,0, ++ 0,114,136,0,0,0,114,107,1,0,0,114,168,0,0,0, + 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, - 84,1,0,0,170,5,0,0,115,22,0,0,0,8,2,4, - 7,8,16,8,4,4,2,8,12,8,5,10,51,8,31,2, - 1,10,17,114,84,1,0,0,99,4,0,0,0,0,0,0, @@ -8437,133 +8319,147 @@ index 8e0650a7dc..4fc3e7f49f 100644 - 110,2,88,0,100,0,83,0,41,6,78,218,10,95,95,108, - 111,97,100,101,114,95,95,218,8,95,95,115,112,101,99,95, - 95,114,85,1,0,0,90,8,95,95,102,105,108,101,95,95, -- 90,10,95,95,99,97,99,104,101,100,95,95,41,6,218,3, ++ 230,0,0,0,107,6,0,0,115,16,0,0,0,0,1,14, ++ 2,8,1,28,1,12,1,8,1,12,1,18,2,122,30,65, ++ 112,112,108,101,70,114,97,109,101,119,111,114,107,70,105,110, ++ 100,101,114,46,102,105,110,100,95,115,112,101,99,41,1,78, ++ 41,6,114,153,0,0,0,114,152,0,0,0,114,154,0,0, ++ 0,114,155,0,0,0,114,236,0,0,0,114,230,0,0,0, ++ 114,10,0,0,0,114,10,0,0,0,114,10,0,0,0,114, ++ 11,0,0,0,114,109,1,0,0,98,6,0,0,115,6,0, ++ 0,0,8,1,4,5,8,3,114,109,1,0,0,99,4,0, ++ 0,0,0,0,0,0,0,0,0,0,6,0,0,0,8,0, ++ 0,0,67,0,0,0,115,146,0,0,0,124,0,160,0,100, ++ 1,161,1,125,4,124,0,160,0,100,2,161,1,125,5,124, ++ 4,115,66,124,5,114,36,124,5,106,1,125,4,110,30,124, ++ 2,124,3,107,2,114,56,116,2,124,1,124,2,131,2,125, ++ 4,110,10,116,3,124,1,124,2,131,2,125,4,124,5,115, ++ 84,116,4,124,1,124,2,124,4,100,3,141,3,125,5,122, ++ 36,124,5,124,0,100,2,60,0,124,4,124,0,100,1,60, ++ 0,124,2,124,0,100,4,60,0,124,3,124,0,100,5,60, ++ 0,87,0,110,20,4,0,116,5,107,10,114,140,1,0,1, ++ 0,1,0,89,0,110,2,88,0,100,0,83,0,41,6,78, ++ 218,10,95,95,108,111,97,100,101,114,95,95,218,8,95,95, ++ 115,112,101,99,95,95,114,91,1,0,0,114,108,1,0,0, + 90,10,95,95,99,97,99,104,101,100,95,95,41,6,218,3, - 103,101,116,114,164,0,0,0,114,39,1,0,0,114,32,1, - 0,0,114,213,0,0,0,218,9,69,120,99,101,112,116,105, - 111,110,41,6,90,2,110,115,114,140,0,0,0,90,8,112, -- 97,116,104,110,97,109,101,90,9,99,112,97,116,104,110,97, ++ 103,101,116,114,168,0,0,0,114,44,1,0,0,114,37,1, ++ 0,0,114,217,0,0,0,218,9,69,120,99,101,112,116,105, ++ 111,110,41,6,90,2,110,115,114,144,0,0,0,90,8,112, + 97,116,104,110,97,109,101,90,9,99,112,97,116,104,110,97, - 109,101,114,164,0,0,0,114,210,0,0,0,114,10,0,0, -- 0,114,10,0,0,0,114,11,0,0,0,218,14,95,102,105, ++ 109,101,114,168,0,0,0,114,214,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,218,14,95,102,105, - 120,95,117,112,95,109,111,100,117,108,101,68,6,0,0,115, -- 34,0,0,0,0,2,10,1,10,1,4,1,4,1,8,1, -- 8,1,12,2,10,1,4,1,14,1,2,1,8,1,8,1, ++ 120,95,117,112,95,109,111,100,117,108,101,121,6,0,0,115, + 34,0,0,0,0,2,10,1,10,1,4,1,4,1,8,1, + 8,1,12,2,10,1,4,1,14,1,2,1,8,1,8,1, - 8,1,12,1,14,2,114,103,1,0,0,99,0,0,0,0, -- 0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0, -- 67,0,0,0,115,38,0,0,0,116,0,116,1,160,2,161, -- 0,102,2,125,0,116,3,116,4,102,2,125,1,116,5,116, -- 6,102,2,125,2,124,0,124,1,124,2,103,3,83,0,41, -- 1,122,95,82,101,116,117,114,110,115,32,97,32,108,105,115, -- 116,32,111,102,32,102,105,108,101,45,98,97,115,101,100,32, -- 109,111,100,117,108,101,32,108,111,97,100,101,114,115,46,10, -- 10,32,32,32,32,69,97,99,104,32,105,116,101,109,32,105, -- 115,32,97,32,116,117,112,108,101,32,40,108,111,97,100,101, -- 114,44,32,115,117,102,102,105,120,101,115,41,46,10,32,32, ++ 8,1,12,1,14,2,114,116,1,0,0,99,0,0,0,0, + 0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0, + 67,0,0,0,115,38,0,0,0,116,0,116,1,160,2,161, + 0,102,2,125,0,116,3,116,4,102,2,125,1,116,5,116, +@@ -2658,14 +2814,14 @@ + 10,32,32,32,32,69,97,99,104,32,105,116,101,109,32,105, + 115,32,97,32,116,117,112,108,101,32,40,108,111,97,100,101, + 114,44,32,115,117,102,102,105,120,101,115,41,46,10,32,32, - 32,32,41,7,114,19,1,0,0,114,187,0,0,0,218,18, -- 101,120,116,101,110,115,105,111,110,95,115,117,102,102,105,120, ++ 32,32,41,7,114,23,1,0,0,114,191,0,0,0,218,18, + 101,120,116,101,110,115,105,111,110,95,115,117,102,102,105,120, - 101,115,114,32,1,0,0,114,126,0,0,0,114,39,1,0, - 0,114,112,0,0,0,41,3,90,10,101,120,116,101,110,115, -- 105,111,110,115,90,6,115,111,117,114,99,101,90,8,98,121, -- 116,101,99,111,100,101,114,10,0,0,0,114,10,0,0,0, ++ 101,115,114,37,1,0,0,114,129,0,0,0,114,44,1,0, ++ 0,114,115,0,0,0,41,3,90,10,101,120,116,101,110,115, + 105,111,110,115,90,6,115,111,117,114,99,101,90,8,98,121, + 116,101,99,111,100,101,114,10,0,0,0,114,10,0,0,0, - 114,11,0,0,0,114,208,0,0,0,91,6,0,0,115,8, - 0,0,0,0,5,12,1,8,1,8,1,114,208,0,0,0, -- 99,1,0,0,0,0,0,0,0,0,0,0,0,12,0,0, -- 0,9,0,0,0,67,0,0,0,115,178,1,0,0,124,0, -- 97,0,116,0,106,1,97,1,116,0,106,2,97,2,116,1, -- 106,3,116,4,25,0,125,1,100,1,68,0,93,48,125,2, -- 124,2,116,1,106,3,107,7,114,56,116,0,160,5,124,2, -- 161,1,125,3,110,10,116,1,106,3,124,2,25,0,125,3, -- 116,6,124,1,124,2,124,3,131,3,1,0,113,30,100,2, -- 100,3,103,1,102,2,100,4,100,5,100,3,103,2,102,2, -- 102,2,125,4,124,4,68,0,93,110,92,2,125,5,125,6, -- 116,7,100,6,100,7,132,0,124,6,68,0,131,1,131,1, -- 115,136,116,8,130,1,124,6,100,8,25,0,125,7,124,5, -- 116,1,106,3,107,6,114,170,116,1,106,3,124,5,25,0, -- 125,8,1,0,113,226,113,106,122,20,116,0,160,5,124,5, -- 161,1,125,8,87,0,1,0,113,226,87,0,113,106,4,0, -- 116,9,107,10,114,214,1,0,1,0,1,0,89,0,113,106, -- 89,0,113,106,88,0,113,106,116,9,100,9,131,1,130,1, -- 116,6,124,1,100,10,124,8,131,3,1,0,116,6,124,1, -- 100,11,124,7,131,3,1,0,116,6,124,1,100,12,100,13, -- 160,10,124,6,161,1,131,3,1,0,116,6,124,1,100,14, -- 100,15,100,16,132,0,124,6,68,0,131,1,131,3,1,0, -- 116,0,160,5,100,17,161,1,125,9,116,6,124,1,100,17, -- 124,9,131,3,1,0,116,0,160,5,100,18,161,1,125,10, -- 116,6,124,1,100,18,124,10,131,3,1,0,124,5,100,4, -- 107,2,144,1,114,110,116,0,160,5,100,19,161,1,125,11, -- 116,6,124,1,100,20,124,11,131,3,1,0,116,6,124,1, -- 100,21,116,11,131,0,131,3,1,0,116,12,160,13,116,2, -- 160,14,161,0,161,1,1,0,124,5,100,4,107,2,144,1, -- 114,174,116,15,160,16,100,22,161,1,1,0,100,23,116,12, -- 107,6,144,1,114,174,100,24,116,17,95,18,100,25,83,0, -- 41,26,122,205,83,101,116,117,112,32,116,104,101,32,112,97, -- 116,104,45,98,97,115,101,100,32,105,109,112,111,114,116,101, -- 114,115,32,102,111,114,32,105,109,112,111,114,116,108,105,98, -- 32,98,121,32,105,109,112,111,114,116,105,110,103,32,110,101, -- 101,100,101,100,10,32,32,32,32,98,117,105,108,116,45,105, -- 110,32,109,111,100,117,108,101,115,32,97,110,100,32,105,110, -- 106,101,99,116,105,110,103,32,116,104,101,109,32,105,110,116, -- 111,32,116,104,101,32,103,108,111,98,97,108,32,110,97,109, -- 101,115,112,97,99,101,46,10,10,32,32,32,32,79,116,104, -- 101,114,32,99,111,109,112,111,110,101,110,116,115,32,97,114, -- 101,32,101,120,116,114,97,99,116,101,100,32,102,114,111,109, -- 32,116,104,101,32,99,111,114,101,32,98,111,111,116,115,116, -- 114,97,112,32,109,111,100,117,108,101,46,10,10,32,32,32, ++ 114,11,0,0,0,114,212,0,0,0,144,6,0,0,115,8, ++ 0,0,0,0,5,12,1,8,1,8,1,114,212,0,0,0, + 99,1,0,0,0,0,0,0,0,0,0,0,0,12,0,0, + 0,9,0,0,0,67,0,0,0,115,178,1,0,0,124,0, + 97,0,116,0,106,1,97,1,116,0,106,2,97,2,116,1, +@@ -2708,119 +2864,133 @@ + 101,32,101,120,116,114,97,99,116,101,100,32,102,114,111,109, + 32,116,104,101,32,99,111,114,101,32,98,111,111,116,115,116, + 114,97,112,32,109,111,100,117,108,101,46,10,10,32,32,32, - 32,41,4,114,89,0,0,0,114,97,0,0,0,218,8,98, - 117,105,108,116,105,110,115,114,184,0,0,0,218,5,112,111, -- 115,105,120,114,2,0,0,0,218,2,110,116,114,1,0,0, -- 0,99,1,0,0,0,0,0,0,0,0,0,0,0,2,0, -- 0,0,3,0,0,0,115,0,0,0,115,26,0,0,0,124, -- 0,93,18,125,1,116,0,124,1,131,1,100,0,107,2,86, -- 0,1,0,113,2,100,1,83,0,114,3,0,0,0,114,5, -- 0,0,0,114,7,0,0,0,114,10,0,0,0,114,10,0, ++ 32,41,4,114,92,0,0,0,114,100,0,0,0,218,8,98, ++ 117,105,108,116,105,110,115,114,188,0,0,0,218,5,112,111, + 115,105,120,114,2,0,0,0,218,2,110,116,114,1,0,0, + 0,99,1,0,0,0,0,0,0,0,0,0,0,0,2,0, + 0,0,3,0,0,0,115,0,0,0,115,26,0,0,0,124, + 0,93,18,125,1,116,0,124,1,131,1,100,0,107,2,86, + 0,1,0,113,2,100,1,83,0,114,3,0,0,0,114,5, + 0,0,0,114,7,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,114,12,0,0,0,127,6,0,0, -- 115,4,0,0,0,4,0,2,0,122,25,95,115,101,116,117, -- 112,46,60,108,111,99,97,108,115,62,46,60,103,101,110,101, -- 120,112,114,62,114,0,0,0,0,122,30,105,109,112,111,114, -- 116,108,105,98,32,114,101,113,117,105,114,101,115,32,112,111, ++ 0,0,114,11,0,0,0,114,12,0,0,0,180,6,0,0, + 115,4,0,0,0,4,0,2,0,122,25,95,115,101,116,117, + 112,46,60,108,111,99,97,108,115,62,46,60,103,101,110,101, + 120,112,114,62,114,0,0,0,0,122,30,105,109,112,111,114, + 116,108,105,98,32,114,101,113,117,105,114,101,115,32,112,111, - 115,105,120,32,111,114,32,110,116,114,21,0,0,0,114,58, - 0,0,0,114,49,0,0,0,114,13,0,0,0,218,20,95, -- 112,97,116,104,115,101,112,115,95,119,105,116,104,95,99,111, -- 108,111,110,99,1,0,0,0,0,0,0,0,0,0,0,0, -- 2,0,0,0,4,0,0,0,83,0,0,0,115,22,0,0, -- 0,104,0,124,0,93,14,125,1,100,0,124,1,155,0,157, -- 2,146,2,113,4,83,0,114,14,0,0,0,114,10,0,0, -- 0,114,16,0,0,0,114,10,0,0,0,114,10,0,0,0, ++ 115,105,120,32,111,114,32,110,116,114,24,0,0,0,114,61, ++ 0,0,0,114,52,0,0,0,114,13,0,0,0,218,20,95, + 112,97,116,104,115,101,112,115,95,119,105,116,104,95,99,111, + 108,111,110,99,1,0,0,0,0,0,0,0,0,0,0,0, + 2,0,0,0,4,0,0,0,83,0,0,0,115,22,0,0, + 0,104,0,124,0,93,14,125,1,100,0,124,1,155,0,157, + 2,146,2,113,4,83,0,114,14,0,0,0,114,10,0,0, + 0,114,16,0,0,0,114,10,0,0,0,114,10,0,0,0, - 114,11,0,0,0,114,18,0,0,0,143,6,0,0,115,4, -- 0,0,0,6,0,2,0,122,25,95,115,101,116,117,112,46, -- 60,108,111,99,97,108,115,62,46,60,115,101,116,99,111,109, -- 112,62,90,7,95,116,104,114,101,97,100,90,8,95,119,101, ++ 114,11,0,0,0,114,18,0,0,0,196,6,0,0,115,4, + 0,0,0,6,0,2,0,122,25,95,115,101,116,117,112,46, + 60,108,111,99,97,108,115,62,46,60,115,101,116,99,111,109, + 112,62,90,7,95,116,104,114,101,97,100,90,8,95,119,101, - 97,107,114,101,102,218,6,119,105,110,114,101,103,114,215,0, - 0,0,114,24,0,0,0,122,4,46,112,121,119,122,6,95, - 100,46,112,121,100,84,78,41,19,114,158,0,0,0,114,25, - 0,0,0,114,187,0,0,0,114,54,1,0,0,114,149,0, -- 0,0,90,18,95,98,117,105,108,116,105,110,95,102,114,111, ++ 97,107,114,101,102,218,6,119,105,110,114,101,103,114,219,0, ++ 0,0,114,27,0,0,0,122,4,46,112,121,119,122,6,95, ++ 100,46,112,121,100,84,78,41,19,114,162,0,0,0,114,28, ++ 0,0,0,114,191,0,0,0,114,59,1,0,0,114,153,0, + 0,0,90,18,95,98,117,105,108,116,105,110,95,102,114,111, - 109,95,110,97,109,101,114,153,0,0,0,218,3,97,108,108, - 114,39,0,0,0,114,141,0,0,0,114,61,0,0,0,114, - 30,0,0,0,114,44,1,0,0,114,191,0,0,0,114,104, - 1,0,0,114,126,0,0,0,114,60,0,0,0,114,214,0, - 0,0,114,218,0,0,0,41,12,218,17,95,98,111,111,116, -- 115,116,114,97,112,95,109,111,100,117,108,101,90,11,115,101, -- 108,102,95,109,111,100,117,108,101,90,12,98,117,105,108,116, -- 105,110,95,110,97,109,101,90,14,98,117,105,108,116,105,110, -- 95,109,111,100,117,108,101,90,10,111,115,95,100,101,116,97, -- 105,108,115,90,10,98,117,105,108,116,105,110,95,111,115,114, ++ 109,95,110,97,109,101,114,157,0,0,0,218,3,97,108,108, ++ 114,42,0,0,0,114,145,0,0,0,114,64,0,0,0,114, ++ 33,0,0,0,114,49,1,0,0,114,195,0,0,0,114,117, ++ 1,0,0,114,129,0,0,0,114,63,0,0,0,114,218,0, ++ 0,0,114,222,0,0,0,41,12,218,17,95,98,111,111,116, + 115,116,114,97,112,95,109,111,100,117,108,101,90,11,115,101, + 108,102,95,109,111,100,117,108,101,90,12,98,117,105,108,116, + 105,110,95,110,97,109,101,90,14,98,117,105,108,116,105,110, + 95,109,111,100,117,108,101,90,10,111,115,95,100,101,116,97, + 105,108,115,90,10,98,117,105,108,116,105,110,95,111,115,114, - 49,0,0,0,114,58,0,0,0,90,9,111,115,95,109,111, -- 100,117,108,101,90,13,116,104,114,101,97,100,95,109,111,100, -- 117,108,101,90,14,119,101,97,107,114,101,102,95,109,111,100, -- 117,108,101,90,13,119,105,110,114,101,103,95,109,111,100,117, -- 108,101,114,10,0,0,0,114,10,0,0,0,114,11,0,0, ++ 52,0,0,0,114,61,0,0,0,90,9,111,115,95,109,111, + 100,117,108,101,90,13,116,104,114,101,97,100,95,109,111,100, + 117,108,101,90,14,119,101,97,107,114,101,102,95,109,111,100, + 117,108,101,90,13,119,105,110,114,101,103,95,109,111,100,117, + 108,101,114,10,0,0,0,114,10,0,0,0,114,11,0,0, - 0,218,6,95,115,101,116,117,112,102,6,0,0,115,78,0, -- 0,0,0,8,4,1,6,1,6,3,10,1,8,1,10,1, -- 12,2,10,1,14,3,22,1,12,2,22,1,8,1,10,1, -- 10,1,6,2,2,1,10,1,10,1,14,1,12,2,8,1, -- 12,1,12,1,18,1,22,3,10,1,12,3,10,1,12,3, -- 10,1,10,1,12,3,14,1,14,1,10,1,10,1,10,1, ++ 0,218,6,95,115,101,116,117,112,155,6,0,0,115,78,0, + 0,0,0,8,4,1,6,1,6,3,10,1,8,1,10,1, + 12,2,10,1,14,3,22,1,12,2,22,1,8,1,10,1, + 10,1,6,2,2,1,10,1,10,1,14,1,12,2,8,1, + 12,1,12,1,18,1,22,3,10,1,12,3,10,1,12,3, + 10,1,10,1,12,3,14,1,14,1,10,1,10,1,10,1, - 114,112,1,0,0,99,1,0,0,0,0,0,0,0,0,0, - 0,0,2,0,0,0,4,0,0,0,67,0,0,0,115,50, -- 0,0,0,116,0,124,0,131,1,1,0,116,1,131,0,125, -- 1,116,2,106,3,160,4,116,5,106,6,124,1,142,0,103, -- 1,161,1,1,0,116,2,106,7,160,8,116,9,161,1,1, ++ 114,125,1,0,0,99,1,0,0,0,0,0,0,0,0,0, ++ 0,0,3,0,0,0,4,0,0,0,67,0,0,0,115,108, + 0,0,0,116,0,124,0,131,1,1,0,116,1,131,0,125, + 1,116,2,106,3,160,4,116,5,106,6,124,1,142,0,103, + 1,161,1,1,0,116,2,106,7,160,8,116,9,161,1,1, - 0,100,1,83,0,41,2,122,41,73,110,115,116,97,108,108, - 32,116,104,101,32,112,97,116,104,45,98,97,115,101,100,32, - 105,109,112,111,114,116,32,99,111,109,112,111,110,101,110,116, @@ -8623,113 +8519,79 @@ index 8e0650a7dc..4fc3e7f49f 100644 - 12,68,14,64,14,29,16,127,0,17,14,72,18,45,18,26, - 4,3,18,58,14,63,14,42,14,127,0,20,14,127,0,27, - 10,23,8,11,8,65, -+ 0,114,18,0,0,0,197,6,0,0,115,4,0,0,0,6, -+ 0,2,0,122,25,95,115,101,116,117,112,46,60,108,111,99, -+ 97,108,115,62,46,60,115,101,116,99,111,109,112,62,90,7, -+ 95,116,104,114,101,97,100,90,8,95,119,101,97,107,114,101, -+ 102,218,6,119,105,110,114,101,103,114,219,0,0,0,114,27, -+ 0,0,0,122,4,46,112,121,119,122,6,95,100,46,112,121, -+ 100,84,78,41,19,114,162,0,0,0,114,28,0,0,0,114, -+ 191,0,0,0,114,59,1,0,0,114,153,0,0,0,90,18, -+ 95,98,117,105,108,116,105,110,95,102,114,111,109,95,110,97, -+ 109,101,114,157,0,0,0,218,3,97,108,108,114,42,0,0, -+ 0,114,145,0,0,0,114,64,0,0,0,114,33,0,0,0, -+ 114,49,1,0,0,114,195,0,0,0,114,117,1,0,0,114, -+ 129,0,0,0,114,63,0,0,0,114,218,0,0,0,114,222, -+ 0,0,0,41,12,218,17,95,98,111,111,116,115,116,114,97, -+ 112,95,109,111,100,117,108,101,90,11,115,101,108,102,95,109, -+ 111,100,117,108,101,90,12,98,117,105,108,116,105,110,95,110, -+ 97,109,101,90,14,98,117,105,108,116,105,110,95,109,111,100, -+ 117,108,101,90,10,111,115,95,100,101,116,97,105,108,115,90, -+ 10,98,117,105,108,116,105,110,95,111,115,114,52,0,0,0, -+ 114,61,0,0,0,90,9,111,115,95,109,111,100,117,108,101, -+ 90,13,116,104,114,101,97,100,95,109,111,100,117,108,101,90, -+ 14,119,101,97,107,114,101,102,95,109,111,100,117,108,101,90, -+ 13,119,105,110,114,101,103,95,109,111,100,117,108,101,114,10, -+ 0,0,0,114,10,0,0,0,114,11,0,0,0,218,6,95, -+ 115,101,116,117,112,156,6,0,0,115,78,0,0,0,0,8, -+ 4,1,6,1,6,3,10,1,8,1,10,1,12,2,10,1, -+ 14,3,22,1,12,2,22,1,8,1,10,1,10,1,6,2, -+ 2,1,10,1,10,1,14,1,12,2,8,1,12,1,12,1, -+ 18,1,22,3,10,1,12,3,10,1,12,3,10,1,10,1, -+ 12,3,14,1,14,1,10,1,10,1,10,1,114,125,1,0, -+ 0,99,1,0,0,0,0,0,0,0,0,0,0,0,3,0, -+ 0,0,4,0,0,0,67,0,0,0,115,108,0,0,0,116, -+ 0,124,0,131,1,1,0,116,1,131,0,125,1,116,2,106, -+ 3,160,4,116,5,106,6,124,1,142,0,103,1,161,1,1, -+ 0,116,2,106,7,160,8,116,9,161,1,1,0,116,2,106, -+ 10,100,1,107,6,114,104,116,11,116,12,116,2,106,13,131, -+ 1,100,2,25,0,100,3,131,2,125,2,116,14,160,15,100, -+ 4,124,2,161,2,1,0,116,2,106,7,160,8,116,16,124, -+ 2,131,1,161,1,1,0,100,5,83,0,41,6,122,41,73, -+ 110,115,116,97,108,108,32,116,104,101,32,112,97,116,104,45, -+ 98,97,115,101,100,32,105,109,112,111,114,116,32,99,111,109, -+ 112,111,110,101,110,116,115,46,62,3,0,0,0,114,20,0, -+ 0,0,114,21,0,0,0,114,22,0,0,0,114,0,0,0, -+ 0,90,10,70,114,97,109,101,119,111,114,107,115,122,41,65, -+ 100,100,105,110,103,32,65,112,112,108,101,32,70,114,97,109, -+ 101,119,111,114,107,32,100,121,108,105,98,32,102,105,110,100, -+ 101,114,32,97,116,32,123,125,78,41,17,114,125,1,0,0, -+ 114,212,0,0,0,114,28,0,0,0,114,80,1,0,0,114, -+ 195,0,0,0,114,90,1,0,0,114,104,1,0,0,218,9, -+ 109,101,116,97,95,112,97,116,104,114,63,0,0,0,114,74, -+ 1,0,0,114,29,0,0,0,114,69,0,0,0,114,76,0, -+ 0,0,90,10,101,120,101,99,117,116,97,98,108,101,114,162, -+ 0,0,0,114,177,0,0,0,114,109,1,0,0,41,3,114, -+ 124,1,0,0,90,17,115,117,112,112,111,114,116,101,100,95, -+ 108,111,97,100,101,114,115,90,17,102,114,97,109,101,119,111, -+ 114,107,115,95,102,111,108,100,101,114,114,10,0,0,0,114, -+ 10,0,0,0,114,11,0,0,0,218,8,95,105,110,115,116, -+ 97,108,108,221,6,0,0,115,16,0,0,0,0,2,8,1, -+ 6,1,20,1,12,1,10,1,20,1,12,1,114,127,1,0, -+ 0,41,1,114,88,0,0,0,41,1,78,41,3,78,78,78, -+ 41,2,114,0,0,0,0,114,0,0,0,0,41,1,84,41, -+ 1,78,41,1,78,41,84,114,155,0,0,0,114,191,0,0, -+ 0,114,92,0,0,0,114,28,0,0,0,114,100,0,0,0, -+ 114,188,0,0,0,114,29,0,0,0,90,11,95,77,83,95, -+ 87,73,78,68,79,87,83,114,120,1,0,0,114,24,0,0, -+ 0,114,122,1,0,0,114,119,1,0,0,114,52,0,0,0, -+ 114,123,1,0,0,114,42,0,0,0,114,61,0,0,0,114, -+ 139,0,0,0,114,59,0,0,0,114,64,0,0,0,114,121, -+ 1,0,0,114,32,0,0,0,90,37,95,67,65,83,69,95, -+ 73,78,83,69,78,83,73,84,73,86,69,95,80,76,65,84, -+ 70,79,82,77,83,95,66,89,84,69,83,95,75,69,89,114, -+ 31,0,0,0,114,33,0,0,0,114,40,0,0,0,114,46, -+ 0,0,0,114,48,0,0,0,114,69,0,0,0,114,76,0, -+ 0,0,114,77,0,0,0,114,81,0,0,0,114,82,0,0, -+ 0,114,84,0,0,0,114,87,0,0,0,114,96,0,0,0, -+ 218,4,116,121,112,101,218,8,95,95,99,111,100,101,95,95, -+ 114,190,0,0,0,114,38,0,0,0,114,176,0,0,0,114, -+ 37,0,0,0,114,43,0,0,0,114,7,1,0,0,114,118, -+ 0,0,0,114,114,0,0,0,114,129,0,0,0,114,115,0, -+ 0,0,90,23,68,69,66,85,71,95,66,89,84,69,67,79, -+ 68,69,95,83,85,70,70,73,88,69,83,90,27,79,80,84, -+ 73,77,73,90,69,68,95,66,89,84,69,67,79,68,69,95, -+ 83,85,70,70,73,88,69,83,114,123,0,0,0,114,130,0, -+ 0,0,114,138,0,0,0,114,140,0,0,0,114,142,0,0, -+ 0,114,164,0,0,0,114,171,0,0,0,114,180,0,0,0, -+ 114,184,0,0,0,114,186,0,0,0,114,193,0,0,0,114, -+ 198,0,0,0,114,199,0,0,0,114,204,0,0,0,218,6, -+ 111,98,106,101,99,116,114,213,0,0,0,114,217,0,0,0, -+ 114,218,0,0,0,114,235,0,0,0,114,248,0,0,0,114, -+ 10,1,0,0,114,37,1,0,0,114,44,1,0,0,114,49, -+ 1,0,0,114,23,1,0,0,114,50,1,0,0,114,72,1, -+ 0,0,114,74,1,0,0,114,90,1,0,0,114,105,1,0, -+ 0,114,109,1,0,0,114,116,1,0,0,114,212,0,0,0, -+ 114,125,1,0,0,114,127,1,0,0,114,10,0,0,0,114, -+ 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,8, -+ 60,109,111,100,117,108,101,62,1,0,0,0,115,174,0,0, -+ 0,4,22,8,1,8,1,8,1,8,1,8,3,10,1,4, -+ 1,8,1,10,2,8,3,4,1,10,2,6,2,22,1,8, -+ 1,8,1,10,1,14,4,4,1,4,1,2,1,2,255,4, -+ 4,8,17,8,5,8,5,8,6,4,1,10,30,8,6,8, -+ 8,8,10,8,9,8,5,8,7,6,1,10,8,8,5,10, -+ 22,10,127,0,13,16,1,12,2,4,1,4,2,6,2,6, -+ 2,8,2,16,71,8,40,8,19,8,12,8,12,8,28,8, -+ 17,8,33,8,28,8,24,10,13,10,10,10,11,8,14,6, -+ 3,4,1,2,255,12,68,14,64,14,29,16,127,0,17,14, -+ 72,18,45,18,26,4,3,18,58,14,63,14,42,14,127,0, -+ 20,14,127,0,25,16,32,14,24,10,23,8,11,8,65, ++ 0,116,2,106,10,100,1,107,6,114,104,116,11,116,12,116, ++ 2,106,13,131,1,100,2,25,0,100,3,131,2,125,2,116, ++ 14,160,15,100,4,124,2,161,2,1,0,116,2,106,7,160, ++ 8,116,16,124,2,131,1,161,1,1,0,100,5,83,0,41, ++ 6,122,41,73,110,115,116,97,108,108,32,116,104,101,32,112, ++ 97,116,104,45,98,97,115,101,100,32,105,109,112,111,114,116, ++ 32,99,111,109,112,111,110,101,110,116,115,46,62,3,0,0, ++ 0,114,20,0,0,0,114,22,0,0,0,114,21,0,0,0, ++ 114,0,0,0,0,90,10,70,114,97,109,101,119,111,114,107, ++ 115,122,41,65,100,100,105,110,103,32,65,112,112,108,101,32, ++ 70,114,97,109,101,119,111,114,107,32,100,121,108,105,98,32, ++ 102,105,110,100,101,114,32,97,116,32,123,125,78,41,17,114, ++ 125,1,0,0,114,212,0,0,0,114,28,0,0,0,114,80, ++ 1,0,0,114,195,0,0,0,114,90,1,0,0,114,104,1, ++ 0,0,218,9,109,101,116,97,95,112,97,116,104,114,63,0, ++ 0,0,114,74,1,0,0,114,29,0,0,0,114,69,0,0, ++ 0,114,76,0,0,0,90,10,101,120,101,99,117,116,97,98, ++ 108,101,114,162,0,0,0,114,177,0,0,0,114,109,1,0, ++ 0,41,3,114,124,1,0,0,90,17,115,117,112,112,111,114, ++ 116,101,100,95,108,111,97,100,101,114,115,90,17,102,114,97, ++ 109,101,119,111,114,107,115,95,102,111,108,100,101,114,114,10, ++ 0,0,0,114,10,0,0,0,114,11,0,0,0,218,8,95, ++ 105,110,115,116,97,108,108,220,6,0,0,115,16,0,0,0, ++ 0,2,8,1,6,1,20,1,12,1,10,1,20,1,12,1, ++ 114,127,1,0,0,41,1,114,88,0,0,0,41,1,78,41, ++ 3,78,78,78,41,2,114,0,0,0,0,114,0,0,0,0, ++ 41,1,84,41,1,78,41,1,78,41,84,114,155,0,0,0, ++ 114,191,0,0,0,114,92,0,0,0,114,28,0,0,0,114, ++ 100,0,0,0,114,188,0,0,0,114,29,0,0,0,90,11, ++ 95,77,83,95,87,73,78,68,79,87,83,114,120,1,0,0, ++ 114,24,0,0,0,114,122,1,0,0,114,119,1,0,0,114, ++ 52,0,0,0,114,123,1,0,0,114,42,0,0,0,114,61, ++ 0,0,0,114,139,0,0,0,114,59,0,0,0,114,64,0, ++ 0,0,114,121,1,0,0,114,32,0,0,0,90,37,95,67, ++ 65,83,69,95,73,78,83,69,78,83,73,84,73,86,69,95, ++ 80,76,65,84,70,79,82,77,83,95,66,89,84,69,83,95, ++ 75,69,89,114,31,0,0,0,114,33,0,0,0,114,40,0, ++ 0,0,114,46,0,0,0,114,48,0,0,0,114,69,0,0, ++ 0,114,76,0,0,0,114,77,0,0,0,114,81,0,0,0, ++ 114,82,0,0,0,114,84,0,0,0,114,87,0,0,0,114, ++ 96,0,0,0,218,4,116,121,112,101,218,8,95,95,99,111, ++ 100,101,95,95,114,190,0,0,0,114,38,0,0,0,114,176, ++ 0,0,0,114,37,0,0,0,114,43,0,0,0,114,7,1, ++ 0,0,114,118,0,0,0,114,114,0,0,0,114,129,0,0, ++ 0,114,115,0,0,0,90,23,68,69,66,85,71,95,66,89, ++ 84,69,67,79,68,69,95,83,85,70,70,73,88,69,83,90, ++ 27,79,80,84,73,77,73,90,69,68,95,66,89,84,69,67, ++ 79,68,69,95,83,85,70,70,73,88,69,83,114,123,0,0, ++ 0,114,130,0,0,0,114,138,0,0,0,114,140,0,0,0, ++ 114,142,0,0,0,114,164,0,0,0,114,171,0,0,0,114, ++ 180,0,0,0,114,184,0,0,0,114,186,0,0,0,114,193, ++ 0,0,0,114,198,0,0,0,114,199,0,0,0,114,204,0, ++ 0,0,218,6,111,98,106,101,99,116,114,213,0,0,0,114, ++ 217,0,0,0,114,218,0,0,0,114,235,0,0,0,114,248, ++ 0,0,0,114,10,1,0,0,114,37,1,0,0,114,44,1, ++ 0,0,114,49,1,0,0,114,23,1,0,0,114,50,1,0, ++ 0,114,72,1,0,0,114,74,1,0,0,114,90,1,0,0, ++ 114,105,1,0,0,114,109,1,0,0,114,116,1,0,0,114, ++ 212,0,0,0,114,125,1,0,0,114,127,1,0,0,114,10, ++ 0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0, ++ 0,0,218,8,60,109,111,100,117,108,101,62,1,0,0,0, ++ 115,174,0,0,0,4,22,8,1,8,1,8,1,8,1,8, ++ 3,10,1,4,1,8,1,10,2,8,3,4,1,10,2,6, ++ 2,22,1,8,1,8,1,10,1,14,4,4,1,4,1,2, ++ 1,2,255,4,4,8,17,8,5,8,5,8,6,4,1,10, ++ 30,8,6,8,8,8,10,8,9,8,5,8,7,6,1,10, ++ 8,8,5,10,22,10,127,0,13,16,1,12,2,4,1,4, ++ 2,6,2,6,2,8,2,16,71,8,40,8,19,8,12,8, ++ 12,8,28,8,17,8,33,8,28,8,24,10,13,10,10,10, ++ 11,8,14,6,3,4,1,2,255,12,68,14,64,14,29,16, ++ 127,0,17,14,72,18,45,18,26,4,3,18,58,14,63,14, ++ 42,14,127,0,20,14,127,0,25,16,32,14,23,10,23,8, ++ 11,8,65, }; diff --git a/Python/marshal.c b/Python/marshal.c index 99075b1081..49421ed5b4 100644