From 9f3c82c30ad1741d35c11ea3e1bb510119e7f476 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 13 Jan 2015 08:47:40 -0700 Subject: [PATCH] Windows: change `delete-{file,directory}` to attempt permission correction If a file or directory delete fails, try adjusting the file or directory permissions to allow writes, then try deleting again. This process should provide a more Unix-like experience and make programs behave more consistently. A new `current-force-delete-permissions` parameter provides access to the raw native behavior. --- .../scribblings/reference/filesystem.scrbl | 30 +- pkgs/racket-test-core/tests/racket/file.rktl | 33 ++ racket/src/racket/include/scheme.h | 1 + racket/src/racket/src/cstartup.inc | 450 +++++++++--------- racket/src/racket/src/file.c | 63 ++- racket/src/racket/src/schminc.h | 2 +- racket/src/racket/src/schvers.h | 4 +- racket/src/racket/src/thread.c | 2 + 8 files changed, 348 insertions(+), 237 deletions(-) diff --git a/pkgs/racket-doc/scribblings/reference/filesystem.scrbl b/pkgs/racket-doc/scribblings/reference/filesystem.scrbl index 5e1b5372b0..fed8ffac5a 100644 --- a/pkgs/racket-doc/scribblings/reference/filesystem.scrbl +++ b/pkgs/racket-doc/scribblings/reference/filesystem.scrbl @@ -270,8 +270,17 @@ Deletes the file with path @racket[path] if it exists, otherwise the @exnraise[exn:fail:filesystem]. If @racket[path] is a link, the link is deleted rather than the destination of the link. +On Windows, if an initial attempt to delete the file fails with a +permission error and the value of +@racket[current-force-delete-permissions] is true, then +@racket[delete-file] attempts to change the file's permissions (to +allow writes) and then delete the file. + On Windows, @racket[delete-file] can delete a symbolic link, but not -a junction. Use @racket[delete-directory] to delete a junction.} +a junction. Use @racket[delete-directory] to delete a junction. + +@history[#:changed "6.1.1.7" @elem{Changed Windows behavior to use + @racket[current-force-delete-permissions].}]} @defproc[(rename-file-or-directory [old path-string?] @@ -419,6 +428,14 @@ link as opposed to a junction. @history[#:changed "6.0.1.12" @elem{Added support for links on Windows.}]} + +@defparam[current-force-delete-permissions any/c boolean?]{ + +A @tech{parameter} that determines on Windows whether +@racket[delete-file] and @racket[delete-directory] attempt to change a +file or directory's permissions to delete it. The default value is +@racket[#t].} + @;------------------------------------------------------------------------ @section[#:tag "directories"]{Directories} @@ -482,7 +499,16 @@ is not created successfully, the @exnraise[exn:fail:filesystem].} Deletes an existing directory with the path @racket[path]. If the directory is not deleted successfully, the -@exnraise[exn:fail:filesystem].} +@exnraise[exn:fail:filesystem]. + +On Windows, if an initial attempt to delete the directory fails with a +permission error and the value of @racket[current-force-delete-permissions] +is true, then @racket[delete-file] attempts to change the +directory's permissions (to allow writes) and then delete the +directory. + +@history[#:changed "6.1.1.7" @elem{Changed Windows behavior to use + @racket[current-force-delete-permissions].}]} @defproc[(directory-list [path path-string? (current-directory)] diff --git a/pkgs/racket-test-core/tests/racket/file.rktl b/pkgs/racket-test-core/tests/racket/file.rktl index e8d19d5d4b..85b8cfc41a 100644 --- a/pkgs/racket-test-core/tests/racket/file.rktl +++ b/pkgs/racket-test-core/tests/racket/file.rktl @@ -1779,6 +1779,39 @@ (err/rt-test (exn:fail:filesystem:errno "a" (current-continuation-marks) '(10))) (err/rt-test (exn:fail:filesystem:errno "a" (current-continuation-marks) '#(10))) +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Make sure a file without write permission can be deleted + +(let () + (define dir (make-temporary-file "~a-tmp" 'directory)) + (define file (build-path dir "f")) + (call-with-output-file file void) + + (file-or-directory-permissions file #o555) + (file-or-directory-permissions dir #o555) + + ;; On Unix, non-writable directory means the file + ;; can't be deleted. + (unless (eq? 'windows (system-type)) + (unless (eq? 'exn (with-handlers ([void (lambda (exn) 'exn)]) + (delete-file file))) + (error "expected an error"))) + + (file-or-directory-permissions dir #o777) + ;; On Windows, non-writable file means the file can't + ;; be deleted --- but turn off `current-force-delete-permissions`, + ;; which works around that behavior. + (when (eq? 'windows (system-type)) + (parameterize ([current-force-delete-permissions #f]) + (unless (eq? 'exn (with-handlers ([void (lambda (exn) 'exn)]) + (delete-file file))) + (error "expected an error")))) + + ;; In default mode, non-writable things in writable directories + ;; an be deleted everywhere: + (delete-file file) + (delete-directory dir)) + ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (report-errs) diff --git a/racket/src/racket/include/scheme.h b/racket/src/racket/include/scheme.h index 0ecf446408..2048a2d9ec 100644 --- a/racket/src/racket/include/scheme.h +++ b/racket/src/racket/include/scheme.h @@ -1404,6 +1404,7 @@ enum { MZCONFIG_CURRENT_DIRECTORY, MZCONFIG_CURRENT_ENV_VARS, + MZCONFIG_FORCE_DELETE_PERMS, MZCONFIG_CURRENT_USER_DIRECTORY, diff --git a/racket/src/racket/src/cstartup.inc b/racket/src/racket/src/cstartup.inc index b956412810..a1f0d8967e 100644 --- a/racket/src/racket/src/cstartup.inc +++ b/racket/src/racket/src/cstartup.inc @@ -1,5 +1,5 @@ { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,55,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,51,0,0,0,1,0,0,10,0,14,0, 19,0,24,0,37,0,42,0,45,0,52,0,56,0,60,0,67,0,74,0,83, 0,87,0,93,0,107,0,121,0,124,0,130,0,134,0,136,0,147,0,149,0, @@ -16,65 +16,65 @@ 108,101,116,114,101,99,45,118,97,108,117,101,115,66,108,97,109,98,100,97,1, 20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,45,107,101,121, 61,118,73,100,101,102,105,110,101,45,118,97,108,117,101,115,97,36,11,8,240, -19,89,0,0,95,144,2,17,36,36,144,2,16,36,36,144,2,16,36,36,16, +20,89,0,0,95,144,2,17,36,36,144,2,16,36,36,144,2,16,36,36,16, 20,2,3,2,2,2,4,2,2,2,5,2,2,2,6,2,2,2,7,2,2, 2,8,2,2,2,9,2,2,2,10,2,2,2,11,2,2,2,12,2,2,97, -37,11,8,240,19,89,0,0,93,144,2,16,36,37,16,2,2,13,146,2,2, -37,2,13,2,2,2,13,96,11,11,8,240,19,89,0,0,16,0,96,38,11, -8,240,19,89,0,0,16,0,18,98,64,104,101,114,101,13,16,6,36,2,14, +37,11,8,240,20,89,0,0,93,144,2,16,36,37,16,2,2,13,146,2,2, +37,2,13,2,2,2,13,96,11,11,8,240,20,89,0,0,16,0,96,38,11, +8,240,20,89,0,0,16,0,18,98,64,104,101,114,101,13,16,6,36,2,14, 2,2,11,11,11,8,32,8,31,8,30,8,29,27,248,22,166,4,195,249,22, 159,4,80,143,39,36,251,22,92,2,18,248,22,104,199,12,249,22,82,2,19, 248,22,106,201,27,248,22,166,4,195,249,22,159,4,80,143,39,36,251,22,92, 2,18,248,22,104,199,249,22,82,2,19,248,22,106,201,12,27,248,22,84,248, 22,166,4,196,28,248,22,90,193,20,14,144,37,36,37,28,248,22,90,248,22, -84,194,248,22,158,20,193,249,22,159,4,80,143,39,36,251,22,92,2,18,248, -22,158,20,199,249,22,82,2,10,248,22,159,20,201,11,18,100,10,13,16,6, +84,194,248,22,159,20,193,249,22,159,4,80,143,39,36,251,22,92,2,18,248, +22,159,20,199,249,22,82,2,10,248,22,160,20,201,11,18,100,10,13,16,6, 36,2,14,2,2,11,11,11,8,32,8,31,8,30,8,29,16,4,11,11,2, -20,3,1,8,101,110,118,49,55,57,52,53,16,4,11,11,2,21,3,1,8, -101,110,118,49,55,57,52,54,27,248,22,84,248,22,166,4,196,28,248,22,90, -193,20,14,144,37,36,37,28,248,22,90,248,22,84,194,248,22,158,20,193,249, +20,3,1,8,101,110,118,49,55,57,52,55,16,4,11,11,2,21,3,1,8, +101,110,118,49,55,57,52,56,27,248,22,84,248,22,166,4,196,28,248,22,90, +193,20,14,144,37,36,37,28,248,22,90,248,22,84,194,248,22,159,20,193,249, 22,159,4,80,143,39,36,250,22,92,2,22,248,22,92,249,22,92,248,22,92, -2,23,248,22,158,20,201,251,22,92,2,18,2,23,2,23,249,22,82,2,7, -248,22,159,20,204,18,100,11,13,16,6,36,2,14,2,2,11,11,11,8,32, +2,23,248,22,159,20,201,251,22,92,2,18,2,23,2,23,249,22,82,2,7, +248,22,160,20,204,18,100,11,13,16,6,36,2,14,2,2,11,11,11,8,32, 8,31,8,30,8,29,16,4,11,11,2,20,3,1,8,101,110,118,49,55,57, -52,56,16,4,11,11,2,21,3,1,8,101,110,118,49,55,57,52,57,248,22, +53,48,16,4,11,11,2,21,3,1,8,101,110,118,49,55,57,53,49,248,22, 166,4,193,27,248,22,166,4,194,249,22,82,248,22,92,248,22,83,196,248,22, -159,20,195,27,248,22,84,248,22,166,4,23,197,1,249,22,159,4,80,143,39, +160,20,195,27,248,22,84,248,22,166,4,23,197,1,249,22,159,4,80,143,39, 36,28,248,22,66,248,22,160,4,248,22,83,23,198,2,27,249,22,2,32,0, 88,148,8,36,37,43,11,9,222,33,40,248,22,166,4,248,22,104,23,200,2, -250,22,92,2,24,248,22,92,249,22,92,248,22,92,248,22,158,20,23,204,2, +250,22,92,2,24,248,22,92,249,22,92,248,22,92,248,22,159,20,23,204,2, 250,22,93,2,25,249,22,2,22,83,23,204,2,248,22,106,23,206,2,249,22, -82,248,22,158,20,23,202,1,249,22,2,22,104,23,200,1,250,22,93,2,22, +82,248,22,159,20,23,202,1,249,22,2,22,104,23,200,1,250,22,93,2,22, 249,22,2,32,0,88,148,8,36,37,47,11,9,222,33,41,248,22,166,4,248, -22,158,20,201,248,22,159,20,198,27,248,22,166,4,194,249,22,82,248,22,92, -248,22,83,196,248,22,159,20,195,27,248,22,84,248,22,166,4,23,197,1,249, +22,159,20,201,248,22,160,20,198,27,248,22,166,4,194,249,22,82,248,22,92, +248,22,83,196,248,22,160,20,195,27,248,22,84,248,22,166,4,23,197,1,249, 22,159,4,80,143,39,36,250,22,93,2,24,249,22,2,32,0,88,148,8,36, -37,47,11,9,222,33,43,248,22,166,4,248,22,83,201,248,22,159,20,198,27, +37,47,11,9,222,33,43,248,22,166,4,248,22,83,201,248,22,160,20,198,27, 248,22,84,248,22,166,4,196,27,248,22,166,4,248,22,83,195,249,22,159,4, -80,143,40,36,28,248,22,90,195,250,22,93,2,22,9,248,22,159,20,199,250, -22,92,2,9,248,22,92,248,22,83,199,250,22,93,2,6,248,22,159,20,201, -248,22,159,20,202,27,248,22,84,248,22,166,4,23,197,1,27,249,22,1,22, +80,143,40,36,28,248,22,90,195,250,22,93,2,22,9,248,22,160,20,199,250, +22,92,2,9,248,22,92,248,22,83,199,250,22,93,2,6,248,22,160,20,201, +248,22,160,20,202,27,248,22,84,248,22,166,4,23,197,1,27,249,22,1,22, 96,249,22,2,22,166,4,248,22,166,4,248,22,83,199,248,22,187,4,249,22, 159,4,80,143,41,36,251,22,92,1,22,119,105,116,104,45,99,111,110,116,105, 110,117,97,116,105,111,110,45,109,97,114,107,2,26,250,22,93,1,23,101,120, 116,101,110,100,45,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110, 21,95,1,27,99,111,110,116,105,110,117,97,116,105,111,110,45,109,97,114,107, 45,115,101,116,45,102,105,114,115,116,11,2,26,202,250,22,93,2,22,9,248, -22,159,20,204,27,248,22,84,248,22,166,4,196,28,248,22,90,193,20,14,144, +22,160,20,204,27,248,22,84,248,22,166,4,196,28,248,22,90,193,20,14,144, 37,36,37,249,22,159,4,80,143,39,36,27,248,22,166,4,248,22,83,197,28, 249,22,170,9,62,61,62,248,22,160,4,248,22,104,196,250,22,92,2,22,248, 22,92,249,22,92,21,93,2,27,248,22,83,199,250,22,93,2,3,249,22,92, -2,27,249,22,92,248,22,113,203,2,27,248,22,159,20,202,251,22,92,2,18, +2,27,249,22,92,248,22,113,203,2,27,248,22,160,20,202,251,22,92,2,18, 28,249,22,170,9,248,22,160,4,248,22,83,200,64,101,108,115,101,10,248,22, -158,20,197,250,22,93,2,22,9,248,22,159,20,200,249,22,82,2,3,248,22, -159,20,202,99,13,16,6,36,2,14,2,2,11,11,11,8,32,8,31,8,30, -8,29,16,4,11,11,2,20,3,1,8,101,110,118,49,55,57,55,49,16,4, -11,11,2,21,3,1,8,101,110,118,49,55,57,55,50,18,143,94,10,64,118, +159,20,197,250,22,93,2,22,9,248,22,160,20,200,249,22,82,2,3,248,22, +160,20,202,99,13,16,6,36,2,14,2,2,11,11,11,8,32,8,31,8,30, +8,29,16,4,11,11,2,20,3,1,8,101,110,118,49,55,57,55,51,16,4, +11,11,2,21,3,1,8,101,110,118,49,55,57,55,52,18,143,94,10,64,118, 111,105,100,8,48,27,248,22,84,248,22,166,4,196,249,22,159,4,80,143,39, 36,28,248,22,66,248,22,160,4,248,22,83,197,250,22,92,2,28,248,22,92, -248,22,158,20,199,248,22,104,198,27,248,22,160,4,248,22,158,20,197,250,22, -92,2,28,248,22,92,248,22,83,197,250,22,93,2,25,248,22,159,20,199,248, -22,159,20,202,144,36,20,114,144,36,16,1,11,16,0,20,26,15,58,9,2, +248,22,159,20,199,248,22,104,198,27,248,22,160,4,248,22,159,20,197,250,22, +92,2,28,248,22,92,248,22,83,197,250,22,93,2,25,248,22,160,20,199,248, +22,160,20,202,144,36,20,114,144,36,16,1,11,16,0,20,26,15,58,9,2, 1,2,1,2,2,11,9,9,11,11,11,10,36,80,143,36,36,20,114,144,36, 16,0,16,0,38,39,36,16,0,36,16,0,36,11,11,11,16,10,2,3,2, 4,2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,12,16,10,11,11, @@ -100,7 +100,7 @@ EVAL_ONE_SIZED_STR((char *)expr, 2056); } { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,55,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,193,0,0,0,1,0,0,8,0,21,0, 26,0,43,0,55,0,77,0,106,0,150,0,156,0,165,0,172,0,187,0,205, 0,217,0,233,0,247,0,13,1,32,1,39,1,73,1,90,1,107,1,130,1, @@ -193,10 +193,10 @@ 23,195,2,11,12,250,22,180,11,2,42,2,43,23,197,2,28,28,248,22,174, 15,23,195,2,249,22,170,9,248,22,175,15,23,197,2,2,44,249,22,170,9, 247,22,181,8,2,44,27,28,248,22,154,7,23,196,2,23,195,2,248,22,166, -8,248,22,178,15,23,197,2,28,249,22,169,16,2,80,23,195,2,28,248,22, +8,248,22,178,15,23,197,2,28,249,22,170,16,2,80,23,195,2,28,248,22, 154,7,195,248,22,181,15,195,194,27,248,22,129,8,23,195,1,249,22,182,15, -248,22,169,8,250,22,177,16,2,81,28,249,22,169,16,2,82,23,201,2,23, -199,1,250,22,177,16,2,83,23,202,1,2,45,80,144,44,37,38,2,44,28, +248,22,169,8,250,22,178,16,2,81,28,249,22,170,16,2,82,23,201,2,23, +199,1,250,22,178,16,2,83,23,202,1,2,45,80,144,44,37,38,2,44,28, 248,22,154,7,194,248,22,181,15,194,193,0,28,35,114,120,34,94,92,92,92, 92,92,92,92,92,91,63,93,92,92,92,92,85,78,67,92,92,92,92,34,86, 95,28,28,28,248,22,173,15,23,195,2,10,28,248,22,154,7,23,195,2,28, @@ -222,22 +222,22 @@ 248,22,133,16,23,194,2,11,12,250,22,180,11,2,42,2,43,23,196,2,28, 28,248,22,174,15,23,194,2,249,22,170,9,248,22,175,15,23,196,2,2,44, 249,22,170,9,247,22,181,8,2,44,27,28,248,22,154,7,23,195,2,23,194, -2,248,22,166,8,248,22,178,15,23,196,2,28,249,22,169,16,2,80,23,195, +2,248,22,166,8,248,22,178,15,23,196,2,28,249,22,170,16,2,80,23,195, 2,28,248,22,154,7,194,248,22,181,15,194,193,27,248,22,129,8,23,195,1, -249,22,182,15,248,22,169,8,250,22,177,16,2,81,28,249,22,169,16,2,82, -23,201,2,23,199,1,250,22,177,16,2,83,23,202,1,2,45,80,144,47,37, +249,22,182,15,248,22,169,8,250,22,178,16,2,81,28,249,22,170,16,2,82, +23,201,2,23,199,1,250,22,178,16,2,83,23,202,1,2,45,80,144,47,37, 38,2,44,28,248,22,154,7,193,248,22,181,15,193,192,27,248,22,178,15,23, 195,2,28,249,22,170,9,23,197,2,64,117,110,105,120,28,249,22,151,8,194, 5,1,47,28,248,22,174,15,198,197,248,22,181,15,198,249,22,191,15,199,249, 22,182,15,249,22,154,8,248,22,178,15,200,37,198,28,249,22,170,9,23,197, -2,2,44,249,22,191,15,23,200,1,249,22,182,15,28,249,22,169,16,0,27, +2,2,44,249,22,191,15,23,200,1,249,22,182,15,28,249,22,170,16,0,27, 35,114,120,34,94,92,92,92,92,92,92,92,92,91,63,93,92,92,92,92,91, 97,45,122,93,58,34,23,199,2,251,22,155,8,2,48,250,22,154,8,203,40, -41,5,1,92,249,22,154,8,202,42,28,249,22,169,16,2,85,23,199,2,249, -22,155,8,2,48,249,22,154,8,200,40,28,249,22,169,16,2,85,23,199,2, -249,22,155,8,2,48,249,22,154,8,200,40,28,249,22,169,16,0,14,35,114, +41,5,1,92,249,22,154,8,202,42,28,249,22,170,16,2,85,23,199,2,249, +22,155,8,2,48,249,22,154,8,200,40,28,249,22,170,16,2,85,23,199,2, +249,22,155,8,2,48,249,22,154,8,200,40,28,249,22,170,16,0,14,35,114, 120,34,94,92,92,92,92,92,92,92,92,34,23,199,2,249,22,155,8,5,4, -85,78,67,92,249,22,154,8,200,38,28,249,22,169,16,0,12,35,114,120,34, +85,78,67,92,249,22,154,8,200,38,28,249,22,170,16,0,12,35,114,120,34, 94,91,97,45,122,93,58,34,198,249,22,155,8,250,22,154,8,201,36,37,249, 22,154,8,200,38,12,198,12,32,87,88,148,8,36,39,53,11,70,102,111,117, 110,100,45,101,120,101,99,222,33,90,32,88,88,148,8,36,40,58,11,64,110, @@ -269,15 +269,15 @@ 185,15,193,192,11,11,28,192,192,28,198,11,251,2,88,198,203,201,202,194,32, 91,88,148,8,36,40,57,11,2,51,222,33,92,28,248,22,90,23,197,2,11, 27,249,22,191,15,248,22,135,16,248,22,83,23,201,2,23,196,2,28,248,22, -185,15,23,194,2,250,2,87,197,198,195,86,94,23,193,1,27,248,22,159,20, +185,15,23,194,2,250,2,87,197,198,195,86,94,23,193,1,27,248,22,160,20, 23,199,1,28,248,22,90,23,194,2,11,27,249,22,191,15,248,22,135,16,248, 22,83,23,198,2,23,198,2,28,248,22,185,15,23,194,2,250,2,87,199,200, -195,86,94,23,193,1,27,248,22,159,20,23,196,1,28,248,22,90,23,194,2, +195,86,94,23,193,1,27,248,22,160,20,23,196,1,28,248,22,90,23,194,2, 11,27,249,22,191,15,248,22,135,16,248,22,83,23,198,2,23,200,2,28,248, -22,185,15,23,194,2,250,2,87,201,202,195,86,94,23,193,1,27,248,22,159, +22,185,15,23,194,2,250,2,87,201,202,195,86,94,23,193,1,27,248,22,160, 20,23,196,1,28,248,22,90,23,194,2,11,27,249,22,191,15,248,22,135,16, 248,22,83,197,201,28,248,22,185,15,193,250,2,87,203,204,195,251,2,91,203, -204,205,248,22,159,20,198,86,95,28,28,248,22,173,15,23,195,2,10,28,248, +204,205,248,22,160,20,198,86,95,28,28,248,22,173,15,23,195,2,10,28,248, 22,154,7,23,195,2,28,248,22,132,16,23,195,2,10,248,22,133,16,23,195, 2,11,12,250,22,180,11,2,6,2,49,23,197,2,28,28,23,195,2,28,28, 248,22,173,15,23,196,2,10,28,248,22,154,7,23,196,2,28,248,22,132,16, @@ -291,30 +291,30 @@ 86,94,23,194,1,9,27,28,249,22,170,9,247,22,181,8,2,44,249,22,82, 248,22,182,15,5,1,46,23,196,1,23,194,1,28,248,22,90,23,194,2,11, 27,249,22,191,15,248,22,135,16,248,22,83,23,198,2,23,200,2,28,248,22, -185,15,23,194,2,250,2,87,201,202,195,86,94,23,193,1,27,248,22,159,20, +185,15,23,194,2,250,2,87,201,202,195,86,94,23,193,1,27,248,22,160,20, 23,196,1,28,248,22,90,23,194,2,11,27,249,22,191,15,248,22,135,16,248, 22,83,23,198,2,23,202,2,28,248,22,185,15,23,194,2,250,2,87,203,204, -195,86,94,23,193,1,27,248,22,159,20,23,196,1,28,248,22,90,23,194,2, +195,86,94,23,193,1,27,248,22,160,20,23,196,1,28,248,22,90,23,194,2, 11,27,249,22,191,15,248,22,135,16,248,22,83,23,198,2,23,204,2,28,248, -22,185,15,23,194,2,250,2,87,205,206,195,86,94,23,193,1,27,248,22,159, +22,185,15,23,194,2,250,2,87,205,206,195,86,94,23,193,1,27,248,22,160, 20,23,196,1,28,248,22,90,23,194,2,11,27,249,22,191,15,248,22,135,16, 248,22,83,197,205,28,248,22,185,15,193,250,2,87,23,15,23,16,195,251,2, -91,23,15,23,16,23,17,248,22,159,20,198,27,248,22,135,16,23,196,1,28, +91,23,15,23,16,23,17,248,22,160,20,198,27,248,22,135,16,23,196,1,28, 248,22,185,15,193,250,2,87,198,199,195,11,250,80,144,39,40,39,196,197,11, 250,80,144,39,40,39,196,11,11,32,96,88,148,8,36,39,55,11,2,51,222, -33,98,0,8,35,114,120,35,34,92,34,34,27,249,22,165,16,23,197,2,23, +33,98,0,8,35,114,120,35,34,92,34,34,27,249,22,166,16,23,197,2,23, 198,2,28,23,193,2,86,94,23,196,1,27,248,22,104,23,195,2,27,27,248, -22,113,23,197,1,27,249,22,165,16,23,201,2,23,196,2,28,23,193,2,86, +22,113,23,197,1,27,249,22,166,16,23,201,2,23,196,2,28,23,193,2,86, 94,23,194,1,27,248,22,104,23,195,2,27,250,2,96,202,23,204,1,248,22, -113,23,199,1,27,28,249,22,170,9,247,22,181,8,2,44,250,22,177,16,2, +113,23,199,1,27,28,249,22,170,9,247,22,181,8,2,44,250,22,178,16,2, 97,23,198,1,2,52,194,28,249,22,151,8,194,2,52,249,22,96,202,195,249, 22,82,248,22,182,15,195,195,86,95,23,199,1,23,193,1,27,28,249,22,170, -9,247,22,181,8,2,44,250,22,177,16,2,97,23,198,1,2,52,194,28,249, +9,247,22,181,8,2,44,250,22,178,16,2,97,23,198,1,2,52,194,28,249, 22,151,8,194,2,52,249,22,96,200,9,249,22,82,248,22,182,15,195,9,27, -28,249,22,170,9,247,22,181,8,2,44,250,22,177,16,2,97,23,198,1,2, +28,249,22,170,9,247,22,181,8,2,44,250,22,178,16,2,97,23,198,1,2, 52,194,28,249,22,151,8,194,2,52,249,22,96,198,195,249,22,82,248,22,182, 15,195,195,86,94,23,193,1,27,28,249,22,170,9,247,22,181,8,2,44,250, -22,177,16,2,97,23,200,1,2,52,196,28,249,22,151,8,194,2,52,249,22, +22,178,16,2,97,23,200,1,2,52,196,28,249,22,151,8,194,2,52,249,22, 96,196,9,249,22,82,248,22,182,15,195,9,86,95,28,28,248,22,143,8,194, 10,248,22,154,7,194,12,250,22,180,11,2,7,6,21,21,40,111,114,47,99, 32,98,121,116,101,115,63,32,115,116,114,105,110,103,63,41,196,28,28,248,22, @@ -405,34 +405,34 @@ 23,194,1,248,22,137,16,249,22,135,16,23,200,1,23,196,1,27,250,80,144, 40,40,39,248,22,150,16,2,57,23,198,1,10,28,23,193,2,248,22,137,16, 23,194,1,11,28,248,22,90,23,196,2,9,28,248,22,83,23,196,2,249,22, -82,27,248,22,158,20,23,199,2,28,248,22,154,7,23,194,2,27,248,22,181, +82,27,248,22,159,20,23,199,2,28,248,22,154,7,23,194,2,27,248,22,181, 15,23,195,1,28,248,22,134,16,23,194,2,192,249,22,135,16,23,195,1,27, 247,80,144,43,51,39,28,23,193,2,192,86,94,23,193,1,247,22,151,16,28, 248,22,143,8,23,194,2,27,248,22,182,15,23,195,1,28,248,22,134,16,23, 194,2,192,249,22,135,16,23,195,1,27,247,80,144,43,51,39,28,23,193,2, 192,86,94,23,193,1,247,22,151,16,28,248,22,173,15,23,194,2,28,248,22, 134,16,23,194,2,192,249,22,135,16,23,195,1,27,247,80,144,42,51,39,28, -23,193,2,192,86,94,23,193,1,247,22,151,16,192,27,248,22,159,20,23,199, +23,193,2,192,86,94,23,193,1,247,22,151,16,192,27,248,22,160,20,23,199, 1,28,248,22,90,23,194,2,9,28,248,22,83,23,194,2,249,22,82,248,80, -144,42,57,39,248,22,158,20,23,197,2,27,248,22,159,20,23,197,1,28,248, +144,42,57,39,248,22,159,20,23,197,2,27,248,22,160,20,23,197,1,28,248, 22,90,23,194,2,9,28,248,22,83,23,194,2,249,22,82,248,80,144,45,57, -39,248,22,158,20,23,197,2,249,80,144,46,8,44,39,23,204,1,248,22,159, +39,248,22,159,20,23,197,2,249,80,144,46,8,44,39,23,204,1,248,22,160, 20,23,198,1,249,22,96,23,202,2,249,80,144,46,8,44,39,23,204,1,248, -22,159,20,23,198,1,249,22,96,23,199,2,27,248,22,159,20,23,197,1,28, +22,160,20,23,198,1,249,22,96,23,199,2,27,248,22,160,20,23,197,1,28, 248,22,90,23,194,2,9,28,248,22,83,23,194,2,249,22,82,248,80,144,45, -57,39,248,22,158,20,23,197,2,249,80,144,46,8,44,39,23,204,1,248,22, -159,20,23,198,1,249,22,96,23,202,2,249,80,144,46,8,44,39,23,204,1, -248,22,159,20,23,198,1,249,22,96,23,196,2,27,248,22,159,20,23,199,1, +57,39,248,22,159,20,23,197,2,249,80,144,46,8,44,39,23,204,1,248,22, +160,20,23,198,1,249,22,96,23,202,2,249,80,144,46,8,44,39,23,204,1, +248,22,160,20,23,198,1,249,22,96,23,196,2,27,248,22,160,20,23,199,1, 28,248,22,90,23,194,2,9,28,248,22,83,23,194,2,249,22,82,248,80,144, -42,57,39,248,22,158,20,23,197,2,27,248,22,159,20,23,197,1,28,248,22, +42,57,39,248,22,159,20,23,197,2,27,248,22,160,20,23,197,1,28,248,22, 90,23,194,2,9,28,248,22,83,23,194,2,249,22,82,248,80,144,45,57,39, -248,22,158,20,23,197,2,249,80,144,46,8,44,39,23,204,1,248,22,159,20, +248,22,159,20,23,197,2,249,80,144,46,8,44,39,23,204,1,248,22,160,20, 23,198,1,249,22,96,23,202,2,249,80,144,46,8,44,39,23,204,1,248,22, -159,20,23,198,1,249,22,96,23,199,2,27,248,22,159,20,23,197,1,28,248, +160,20,23,198,1,249,22,96,23,199,2,27,248,22,160,20,23,197,1,28,248, 22,90,23,194,2,9,28,248,22,83,23,194,2,249,22,82,248,80,144,45,57, -39,248,22,158,20,23,197,2,249,80,144,46,8,44,39,23,204,1,248,22,159, +39,248,22,159,20,23,197,2,249,80,144,46,8,44,39,23,204,1,248,22,160, 20,23,198,1,249,22,96,23,202,2,249,80,144,46,8,44,39,23,204,1,248, -22,159,20,23,198,1,27,250,22,160,2,23,198,1,23,199,1,11,28,192,249, +22,160,20,23,198,1,27,250,22,160,2,23,198,1,23,199,1,11,28,192,249, 80,144,39,8,44,39,198,194,196,27,248,22,150,16,2,59,28,248,22,134,16, 23,194,2,248,22,137,16,23,194,1,28,248,22,133,16,23,194,2,90,144,39, 11,89,146,39,36,11,248,22,130,16,249,22,135,16,250,80,144,46,40,39,248, @@ -451,9 +451,9 @@ 39,28,23,193,2,192,86,94,23,193,1,247,22,151,16,28,248,22,173,15,23, 194,2,28,248,22,134,16,23,194,2,192,249,22,135,16,23,195,1,27,247,80, 144,43,51,39,28,23,193,2,192,86,94,23,193,1,247,22,151,16,192,250,22, -96,248,22,92,11,28,247,22,157,16,28,247,22,158,16,248,22,92,250,22,191, +96,248,22,92,11,28,247,22,158,16,28,247,22,159,16,248,22,92,250,22,191, 15,248,22,150,16,2,62,250,22,160,2,23,204,2,2,60,247,22,172,8,2, -61,9,9,28,247,22,158,16,250,80,144,44,59,39,23,200,1,78,108,105,110, +61,9,9,28,247,22,159,16,250,80,144,44,59,39,23,200,1,78,108,105,110, 107,115,45,115,101,97,114,99,104,45,102,105,108,101,115,248,22,92,23,200,1, 9,248,22,172,13,23,194,1,249,22,16,80,144,38,8,26,38,28,248,22,128, 13,23,197,2,86,94,23,196,1,32,0,88,148,8,36,36,41,11,9,222,11, @@ -503,7 +503,7 @@ 194,1,12,249,22,82,27,248,22,189,5,23,199,1,250,22,46,22,37,88,148, 36,36,8,24,11,9,223,3,33,131,2,20,20,94,88,148,36,36,43,11,9, 223,3,33,132,2,23,196,1,194,249,22,82,11,194,28,28,23,195,2,28,248, -22,84,23,196,2,248,22,168,9,249,22,174,14,36,248,22,159,20,23,199,2, +22,84,23,196,2,248,22,168,9,249,22,174,14,36,248,22,160,20,23,199,2, 11,11,194,86,94,23,195,1,249,22,14,20,20,94,88,148,8,32,36,58,16, 4,36,8,128,80,8,240,0,64,0,0,36,9,224,2,3,33,133,2,23,196, 1,80,144,38,8,26,38,27,248,22,168,9,194,28,192,192,248,22,168,9,248, @@ -520,22 +520,22 @@ 120,112,101,99,116,101,100,32,97,32,115,105,110,103,108,101,32,83,45,101,120, 112,114,101,115,115,105,111,110,248,22,134,6,23,194,1,28,248,22,91,193,28, 28,249,22,130,4,38,248,22,95,195,10,249,22,130,4,39,248,22,95,195,28, -28,248,22,154,7,248,22,83,194,10,28,249,22,170,9,2,65,248,22,158,20, -195,10,249,22,170,9,2,66,248,22,158,20,195,28,27,248,22,104,194,28,248, +28,248,22,154,7,248,22,83,194,10,28,249,22,170,9,2,65,248,22,159,20, +195,10,249,22,170,9,2,66,248,22,159,20,195,28,27,248,22,104,194,28,248, 22,173,15,193,10,28,248,22,154,7,193,28,248,22,132,16,193,10,248,22,133, -16,193,11,27,248,22,90,248,22,106,195,28,192,192,248,22,178,16,248,22,113, +16,193,11,27,248,22,90,248,22,106,195,28,192,192,248,22,179,16,248,22,113, 195,11,11,11,11,28,248,22,186,15,249,22,191,15,23,196,2,23,198,2,27, 248,22,70,248,22,177,15,23,198,1,250,22,158,2,23,198,2,23,196,2,249, 22,82,23,199,1,250,22,160,2,23,203,1,23,201,1,9,12,250,22,158,2, 23,197,1,23,198,1,249,22,82,23,198,1,23,201,1,28,28,248,22,90,248, -22,106,23,197,2,10,249,22,169,16,248,22,113,23,198,2,247,22,172,8,27, +22,106,23,197,2,10,249,22,170,16,248,22,113,23,198,2,247,22,172,8,27, 248,22,137,16,249,22,135,16,248,22,104,23,200,2,23,198,1,28,249,22,170, 9,248,22,83,23,199,2,2,66,86,94,23,196,1,249,22,3,20,20,94,88, 148,8,36,37,53,11,9,224,3,2,33,141,2,23,196,1,248,22,140,16,23, -196,1,28,249,22,170,9,248,22,158,20,23,199,2,2,65,86,94,23,196,1, +196,1,28,249,22,170,9,248,22,159,20,23,199,2,2,65,86,94,23,196,1, 86,94,28,250,22,160,2,23,197,2,11,11,12,250,22,158,2,23,197,2,11, 9,249,22,166,2,23,196,2,20,20,95,88,148,8,36,38,50,11,9,224,3, -2,33,142,2,23,195,1,23,196,1,27,248,22,70,248,22,158,20,23,199,1, +2,33,142,2,23,195,1,23,196,1,27,248,22,70,248,22,159,20,23,199,1, 250,22,158,2,23,198,2,23,196,2,249,22,82,248,22,131,2,23,200,1,250, 22,160,2,23,203,1,23,201,1,9,12,250,22,158,2,23,196,1,23,197,1, 248,22,97,23,199,1,27,28,28,23,194,2,248,22,168,9,248,22,83,23,196, @@ -552,7 +552,7 @@ 250,80,144,40,8,47,39,23,198,2,23,196,2,11,27,250,22,160,2,80,144, 41,8,25,38,23,197,2,21,143,11,17,0,0,27,248,22,83,23,195,2,27, 249,80,144,42,8,27,39,23,198,2,23,196,2,28,249,22,172,9,23,195,2, -23,196,1,248,22,159,20,195,86,94,23,195,1,20,13,144,80,144,40,8,28, +23,196,1,248,22,160,20,195,86,94,23,195,1,20,13,144,80,144,40,8,28, 37,250,80,144,43,8,47,39,23,201,1,23,199,2,23,196,2,27,20,20,95, 88,148,8,36,36,52,8,240,0,0,0,2,9,225,5,4,1,33,145,2,23, 194,1,23,197,1,28,249,22,50,23,195,2,36,20,13,144,80,144,41,43,37, @@ -562,7 +562,7 @@ 154,15,11,22,155,15,10,22,141,15,11,247,23,193,1,250,22,180,11,2,8, 2,53,23,196,1,248,22,8,20,20,94,88,148,36,37,8,43,16,4,8,128, 6,8,128,104,8,240,0,128,0,0,36,9,224,1,2,33,146,2,23,195,1, -0,7,35,114,120,34,47,43,34,28,248,22,154,7,23,195,2,27,249,22,167, +0,7,35,114,120,34,47,43,34,28,248,22,154,7,23,195,2,27,249,22,168, 16,2,148,2,23,197,2,28,23,193,2,28,249,22,130,4,248,22,103,23,196, 2,248,22,184,3,248,22,157,7,23,199,2,249,22,7,250,22,176,7,23,200, 1,36,248,22,103,23,199,1,23,198,1,249,22,7,250,22,176,7,23,200,2, @@ -570,7 +570,7 @@ 200,1,23,200,1,249,22,7,23,197,1,23,198,1,90,144,39,11,89,146,39, 36,11,248,22,130,16,23,198,1,86,94,23,195,1,28,249,22,170,9,23,195, 2,2,50,86,94,23,193,1,249,22,7,23,196,1,23,200,1,27,249,22,82, -23,197,1,23,201,1,28,248,22,154,7,23,195,2,27,249,22,167,16,2,148, +23,197,1,23,201,1,28,248,22,154,7,23,195,2,27,249,22,168,16,2,148, 2,23,197,2,28,23,193,2,28,249,22,130,4,248,22,103,23,196,2,248,22, 184,3,248,22,157,7,23,199,2,249,22,7,250,22,176,7,23,200,1,36,248, 22,103,23,199,1,23,196,1,249,22,7,250,22,176,7,23,200,2,36,248,22, @@ -579,44 +579,44 @@ 22,130,16,23,198,1,86,94,23,195,1,28,249,22,170,9,23,195,2,2,50, 86,94,23,193,1,249,22,7,23,196,1,23,198,1,249,80,144,45,8,31,39, 194,249,22,82,197,199,28,248,22,90,23,196,2,9,28,248,22,83,23,196,2, -28,248,22,151,2,248,22,158,20,23,197,2,250,22,96,249,22,2,22,131,2, -250,22,160,2,248,22,158,20,23,204,2,23,202,2,9,250,22,160,2,248,22, -158,20,23,202,2,11,9,27,248,22,159,20,23,200,1,28,248,22,90,23,194, -2,9,28,248,22,83,23,194,2,28,248,22,151,2,248,22,158,20,23,195,2, -250,22,96,249,22,2,22,131,2,250,22,160,2,248,22,158,20,23,202,2,23, -206,2,9,250,22,160,2,248,22,158,20,23,200,2,11,9,249,80,144,45,8, -48,39,23,203,1,248,22,159,20,23,199,1,27,248,80,144,42,8,30,39,248, -22,158,20,23,196,2,250,22,96,250,22,160,2,23,199,2,23,205,2,9,250, -22,160,2,23,199,1,11,9,249,80,144,46,8,48,39,23,204,1,248,22,159, -20,23,200,1,249,22,96,247,22,153,16,249,80,144,44,8,48,39,23,202,1, -248,22,159,20,23,198,1,27,248,80,144,38,8,30,39,248,22,158,20,23,198, +28,248,22,151,2,248,22,159,20,23,197,2,250,22,96,249,22,2,22,131,2, +250,22,160,2,248,22,159,20,23,204,2,23,202,2,9,250,22,160,2,248,22, +159,20,23,202,2,11,9,27,248,22,160,20,23,200,1,28,248,22,90,23,194, +2,9,28,248,22,83,23,194,2,28,248,22,151,2,248,22,159,20,23,195,2, +250,22,96,249,22,2,22,131,2,250,22,160,2,248,22,159,20,23,202,2,23, +206,2,9,250,22,160,2,248,22,159,20,23,200,2,11,9,249,80,144,45,8, +48,39,23,203,1,248,22,160,20,23,199,1,27,248,80,144,42,8,30,39,248, +22,159,20,23,196,2,250,22,96,250,22,160,2,23,199,2,23,205,2,9,250, +22,160,2,23,199,1,11,9,249,80,144,46,8,48,39,23,204,1,248,22,160, +20,23,200,1,249,22,96,247,22,154,16,249,80,144,44,8,48,39,23,202,1, +248,22,160,20,23,198,1,27,248,80,144,38,8,30,39,248,22,159,20,23,198, 2,250,22,96,250,22,160,2,23,199,2,23,201,2,9,250,22,160,2,23,199, -1,11,9,27,248,22,159,20,23,201,1,28,248,22,90,23,194,2,9,28,248, -22,83,23,194,2,28,248,22,151,2,248,22,158,20,23,195,2,250,22,96,249, -22,2,22,131,2,250,22,160,2,248,22,158,20,23,202,2,23,207,2,9,250, -22,160,2,248,22,158,20,23,200,2,11,9,249,80,144,46,8,48,39,23,204, -1,248,22,159,20,23,199,1,27,248,80,144,43,8,30,39,248,22,158,20,23, +1,11,9,27,248,22,160,20,23,201,1,28,248,22,90,23,194,2,9,28,248, +22,83,23,194,2,28,248,22,151,2,248,22,159,20,23,195,2,250,22,96,249, +22,2,22,131,2,250,22,160,2,248,22,159,20,23,202,2,23,207,2,9,250, +22,160,2,248,22,159,20,23,200,2,11,9,249,80,144,46,8,48,39,23,204, +1,248,22,160,20,23,199,1,27,248,80,144,43,8,30,39,248,22,159,20,23, 196,2,250,22,96,250,22,160,2,23,199,2,23,206,2,9,250,22,160,2,23, -199,1,11,9,249,80,144,47,8,48,39,23,205,1,248,22,159,20,23,200,1, -249,22,96,247,22,153,16,249,80,144,45,8,48,39,23,203,1,248,22,159,20, -23,198,1,249,22,96,247,22,153,16,27,248,22,159,20,23,199,1,28,248,22, -90,23,194,2,9,28,248,22,83,23,194,2,28,248,22,151,2,248,22,158,20, -23,195,2,250,22,96,249,22,2,22,131,2,250,22,160,2,248,22,158,20,23, -202,2,23,205,2,9,250,22,160,2,248,22,158,20,23,200,2,11,9,249,80, -144,44,8,48,39,23,202,1,248,22,159,20,23,199,1,27,248,80,144,41,8, -30,39,248,22,158,20,23,196,2,250,22,96,250,22,160,2,23,199,2,23,204, +199,1,11,9,249,80,144,47,8,48,39,23,205,1,248,22,160,20,23,200,1, +249,22,96,247,22,154,16,249,80,144,45,8,48,39,23,203,1,248,22,160,20, +23,198,1,249,22,96,247,22,154,16,27,248,22,160,20,23,199,1,28,248,22, +90,23,194,2,9,28,248,22,83,23,194,2,28,248,22,151,2,248,22,159,20, +23,195,2,250,22,96,249,22,2,22,131,2,250,22,160,2,248,22,159,20,23, +202,2,23,205,2,9,250,22,160,2,248,22,159,20,23,200,2,11,9,249,80, +144,44,8,48,39,23,202,1,248,22,160,20,23,199,1,27,248,80,144,41,8, +30,39,248,22,159,20,23,196,2,250,22,96,250,22,160,2,23,199,2,23,204, 2,9,250,22,160,2,23,199,1,11,9,249,80,144,45,8,48,39,23,203,1, -248,22,159,20,23,200,1,249,22,96,247,22,153,16,249,80,144,43,8,48,39, -23,201,1,248,22,159,20,23,198,1,32,151,2,88,148,8,36,37,47,11,2, +248,22,160,20,23,200,1,249,22,96,247,22,154,16,249,80,144,43,8,48,39, +23,201,1,248,22,160,20,23,198,1,32,151,2,88,148,8,36,37,47,11,2, 51,222,33,152,2,28,248,22,90,248,22,84,23,195,2,248,22,92,27,248,22, -158,20,195,28,248,22,173,15,193,248,22,177,15,193,192,250,22,93,27,248,22, -158,20,23,198,2,28,248,22,173,15,193,248,22,177,15,193,192,2,68,248,2, -151,2,248,22,159,20,23,198,1,250,22,138,8,6,7,7,10,32,126,97,32, +159,20,195,28,248,22,173,15,193,248,22,177,15,193,192,250,22,93,27,248,22, +159,20,23,198,2,28,248,22,173,15,193,248,22,177,15,193,192,2,68,248,2, +151,2,248,22,160,20,23,198,1,250,22,138,8,6,7,7,10,32,126,97,32, 126,97,6,1,1,32,23,196,1,249,22,138,8,6,6,6,10,32,32,32,126, 97,248,22,134,2,23,196,1,32,155,2,88,148,36,38,48,11,66,102,105,108, 116,101,114,222,33,156,2,28,248,22,90,23,195,2,9,28,248,23,194,2,248, -22,83,23,196,2,249,22,82,248,22,158,20,23,197,2,249,2,155,2,23,197, -1,248,22,159,20,23,199,1,249,2,155,2,23,195,1,248,22,159,20,23,197, +22,83,23,196,2,249,22,82,248,22,159,20,23,197,2,249,2,155,2,23,197, +1,248,22,160,20,23,199,1,249,2,155,2,23,195,1,248,22,160,20,23,197, 1,28,248,22,90,23,201,2,86,95,23,200,1,23,199,1,28,23,201,2,28, 197,249,22,191,15,202,199,200,27,28,248,22,90,23,198,2,2,67,249,22,1, 22,177,7,248,2,151,2,23,200,2,248,23,199,1,251,22,138,8,6,70,70, @@ -627,8 +627,8 @@ 2,248,22,177,15,23,202,1,23,201,1,250,22,177,7,28,248,22,173,15,23, 205,2,248,22,177,15,23,205,1,23,204,1,2,68,23,201,2,249,22,1,22, 177,7,249,22,2,32,0,88,148,8,36,37,45,11,9,222,33,153,2,27,248, -22,95,23,206,2,27,248,22,95,247,22,153,16,28,249,22,131,4,249,22,186, -3,23,198,2,23,197,2,41,23,206,2,249,22,96,247,22,153,16,248,22,92, +22,95,23,206,2,27,248,22,95,247,22,154,16,28,249,22,131,4,249,22,186, +3,23,198,2,23,197,2,41,23,206,2,249,22,96,247,22,154,16,248,22,92, 249,22,138,8,6,50,50,46,46,46,32,91,126,97,32,97,100,100,105,116,105, 111,110,97,108,32,108,105,110,107,101,100,32,97,110,100,32,112,97,99,107,97, 103,101,32,100,105,114,101,99,116,111,114,105,101,115,93,249,22,186,3,23,201, @@ -639,7 +639,7 @@ 88,148,8,36,37,45,11,9,222,33,154,2,249,2,155,2,22,133,2,23,209, 1,86,95,23,200,1,23,198,1,2,67,27,248,22,83,23,202,2,27,28,248, 22,173,15,23,195,2,249,22,191,15,23,196,1,23,199,2,248,22,134,2,23, -195,1,28,28,248,22,173,15,248,22,158,20,23,204,2,248,22,186,15,23,194, +195,1,28,28,248,22,173,15,248,22,159,20,23,204,2,248,22,186,15,23,194, 2,10,27,250,22,1,22,191,15,23,197,1,23,202,2,28,28,248,22,90,23, 200,2,10,248,22,186,15,23,194,2,28,23,201,2,28,28,250,80,144,42,8, 32,39,195,203,204,10,27,28,248,22,173,15,202,248,22,177,15,202,201,19,248, @@ -648,20 +648,20 @@ 40,249,22,177,7,250,22,176,7,23,200,1,36,249,22,186,3,23,201,4,40, 6,3,3,46,115,115,86,94,23,195,1,11,11,28,23,193,2,250,80,144,45, 8,32,39,198,23,196,1,23,15,11,2,28,200,249,22,191,15,194,202,192,26, -8,80,144,47,8,49,39,204,205,206,23,15,23,16,23,17,248,22,159,20,23, +8,80,144,47,8,49,39,204,205,206,23,15,23,16,23,17,248,22,160,20,23, 19,28,23,19,23,19,200,28,200,249,22,191,15,194,202,192,26,8,80,144,47, -8,49,39,204,205,206,23,15,23,16,23,17,248,22,159,20,23,19,23,19,26, -8,80,144,46,8,49,39,203,204,205,206,23,15,23,16,248,22,159,20,23,18, +8,49,39,204,205,206,23,15,23,16,23,17,248,22,160,20,23,19,23,19,26, +8,80,144,46,8,49,39,203,204,205,206,23,15,23,16,248,22,160,20,23,18, 23,18,90,144,38,11,89,146,38,36,11,249,80,144,40,8,31,39,23,199,1, 23,200,1,27,248,22,70,28,248,22,173,15,195,248,22,177,15,195,194,27,27, -247,22,154,16,28,248,22,90,23,194,2,9,28,248,22,83,23,194,2,28,248, -22,151,2,248,22,158,20,23,195,2,250,22,96,249,22,2,22,131,2,250,22, -160,2,248,22,158,20,23,202,2,23,203,2,9,250,22,160,2,248,22,158,20, -23,200,2,11,9,249,80,144,46,8,48,39,23,200,1,248,22,159,20,23,199, -1,27,248,80,144,43,8,30,39,248,22,158,20,23,196,2,250,22,96,250,22, +247,22,155,16,28,248,22,90,23,194,2,9,28,248,22,83,23,194,2,28,248, +22,151,2,248,22,159,20,23,195,2,250,22,96,249,22,2,22,131,2,250,22, +160,2,248,22,159,20,23,202,2,23,203,2,9,250,22,160,2,248,22,159,20, +23,200,2,11,9,249,80,144,46,8,48,39,23,200,1,248,22,160,20,23,199, +1,27,248,80,144,43,8,30,39,248,22,159,20,23,196,2,250,22,96,250,22, 160,2,23,199,2,23,202,2,9,250,22,160,2,23,199,1,11,9,249,80,144, -47,8,48,39,23,201,1,248,22,159,20,23,200,1,249,22,96,247,22,153,16, -249,80,144,45,8,48,39,23,199,1,248,22,159,20,23,198,1,26,8,80,144, +47,8,48,39,23,201,1,248,22,160,20,23,200,1,249,22,96,247,22,154,16, +249,80,144,45,8,48,39,23,199,1,248,22,160,20,23,198,1,26,8,80,144, 48,8,49,39,200,202,203,205,23,16,23,17,200,11,32,159,2,88,148,8,36, 39,56,11,2,51,222,33,160,2,28,248,22,135,4,23,196,2,86,94,23,195, 1,19,248,22,148,8,23,195,2,19,248,22,148,8,23,196,2,249,22,183,15, @@ -683,8 +683,8 @@ 90,144,38,11,89,146,38,36,11,250,80,144,43,8,34,39,23,202,2,2,69, 2,38,27,248,22,179,15,23,196,1,27,250,2,159,2,23,197,2,23,204,1, 248,22,148,8,23,198,1,28,248,22,174,15,195,249,22,191,15,196,194,192,27, -247,22,155,16,249,22,5,20,20,96,88,148,36,37,48,44,9,226,5,6,2, -3,33,162,2,23,196,1,23,195,1,23,199,1,247,22,156,16,11,86,95,28, +247,22,156,16,249,22,5,20,20,96,88,148,36,37,48,44,9,226,5,6,2, +3,33,162,2,23,196,1,23,195,1,23,199,1,247,22,157,16,11,86,95,28, 28,248,22,174,15,23,194,2,10,28,248,22,173,15,23,194,2,10,28,248,22, 154,7,23,194,2,28,248,22,132,16,23,194,2,10,248,22,133,16,23,194,2, 11,12,252,22,180,11,23,200,2,2,43,36,23,198,2,23,199,2,28,28,248, @@ -826,15 +826,15 @@ 248,22,150,16,2,58,86,95,23,195,1,23,194,1,248,22,137,16,249,22,135, 16,23,199,1,23,196,1,27,250,80,144,42,40,39,248,22,150,16,2,57,23, 197,1,10,28,23,193,2,248,22,137,16,23,194,1,11,28,23,193,2,249,22, -82,248,22,137,16,249,22,135,16,23,198,1,247,22,151,16,27,248,22,159,20, +82,248,22,137,16,249,22,135,16,23,198,1,247,22,151,16,27,248,22,160,20, 23,199,1,28,248,22,90,23,194,2,9,27,248,80,144,42,53,39,248,22,83, 23,196,2,28,23,193,2,249,22,82,248,22,137,16,249,22,135,16,23,198,1, -247,22,151,16,248,80,144,44,8,50,39,248,22,159,20,23,198,1,86,94,23, -193,1,248,80,144,42,8,50,39,248,22,159,20,23,196,1,86,94,23,193,1, -27,248,22,159,20,23,197,1,28,248,22,90,23,194,2,9,27,248,80,144,40, +247,22,151,16,248,80,144,44,8,50,39,248,22,160,20,23,198,1,86,94,23, +193,1,248,80,144,42,8,50,39,248,22,160,20,23,196,1,86,94,23,193,1, +27,248,22,160,20,23,197,1,28,248,22,90,23,194,2,9,27,248,80,144,40, 53,39,248,22,83,23,196,2,28,23,193,2,249,22,82,248,22,137,16,249,22, -135,16,23,198,1,247,22,151,16,248,80,144,42,8,50,39,248,22,159,20,23, -198,1,86,94,23,193,1,248,80,144,40,8,50,39,248,22,159,20,23,196,1, +135,16,23,198,1,247,22,151,16,248,80,144,42,8,50,39,248,22,160,20,23, +198,1,86,94,23,193,1,248,80,144,40,8,50,39,248,22,160,20,23,196,1, 28,248,22,90,23,195,2,9,27,27,248,22,83,23,197,2,28,248,22,134,16, 23,194,2,248,22,137,16,23,194,1,28,248,22,133,16,23,194,2,90,144,39, 11,89,146,39,36,11,248,22,130,16,249,22,135,16,250,80,144,47,40,39,248, @@ -842,15 +842,15 @@ 248,22,137,16,249,22,135,16,23,199,1,23,196,1,27,250,80,144,42,40,39, 248,22,150,16,2,57,23,197,1,10,28,23,193,2,248,22,137,16,23,194,1, 11,28,23,193,2,249,22,82,248,22,137,16,249,22,135,16,23,198,1,247,22, -151,16,27,248,22,159,20,23,199,1,28,248,22,90,23,194,2,9,27,248,80, +151,16,27,248,22,160,20,23,199,1,28,248,22,90,23,194,2,9,27,248,80, 144,42,53,39,248,22,83,23,196,2,28,23,193,2,249,22,82,248,22,137,16, -249,22,135,16,23,198,1,247,22,151,16,248,80,144,44,8,51,39,248,22,159, -20,23,198,1,86,94,23,193,1,248,80,144,42,8,51,39,248,22,159,20,23, -196,1,86,94,23,193,1,27,248,22,159,20,23,197,1,28,248,22,90,23,194, +249,22,135,16,23,198,1,247,22,151,16,248,80,144,44,8,51,39,248,22,160, +20,23,198,1,86,94,23,193,1,248,80,144,42,8,51,39,248,22,160,20,23, +196,1,86,94,23,193,1,27,248,22,160,20,23,197,1,28,248,22,90,23,194, 2,9,27,248,80,144,40,53,39,248,22,83,23,196,2,28,23,193,2,249,22, 82,248,22,137,16,249,22,135,16,23,198,1,247,22,151,16,248,80,144,42,8, -51,39,248,22,159,20,23,198,1,86,94,23,193,1,248,80,144,40,8,51,39, -248,22,159,20,23,196,1,27,248,22,150,16,2,59,28,248,22,134,16,23,194, +51,39,248,22,160,20,23,198,1,86,94,23,193,1,248,80,144,40,8,51,39, +248,22,160,20,23,196,1,27,248,22,150,16,2,59,28,248,22,134,16,23,194, 2,248,22,137,16,23,194,1,28,248,22,133,16,23,194,2,90,144,39,11,89, 146,39,36,11,248,22,130,16,249,22,135,16,250,80,144,46,40,39,248,22,150, 16,2,57,11,11,248,22,150,16,2,58,86,95,23,195,1,23,194,1,248,22, @@ -863,51 +863,51 @@ 22,137,16,249,22,135,16,23,199,1,23,196,1,27,250,80,144,42,40,39,248, 22,150,16,2,57,23,197,1,10,28,23,193,2,248,22,137,16,23,194,1,11, 28,23,193,2,249,22,82,248,22,137,16,249,22,135,16,23,198,1,247,22,151, -16,27,248,22,159,20,23,199,1,28,248,22,90,23,194,2,9,27,27,248,22, +16,27,248,22,160,20,23,199,1,28,248,22,90,23,194,2,9,27,27,248,22, 83,23,196,2,28,248,22,134,16,23,194,2,248,22,137,16,23,194,1,28,248, 22,133,16,23,194,2,90,144,39,11,89,146,39,36,11,248,22,130,16,249,22, 135,16,250,80,144,51,40,39,248,22,150,16,2,57,11,11,248,22,150,16,2, 58,86,95,23,195,1,23,194,1,248,22,137,16,249,22,135,16,23,199,1,23, 196,1,27,250,80,144,46,40,39,248,22,150,16,2,57,23,197,1,10,28,23, 193,2,248,22,137,16,23,194,1,11,28,23,193,2,249,22,82,248,22,137,16, -249,22,135,16,23,198,1,247,22,151,16,27,248,22,159,20,23,198,1,28,248, +249,22,135,16,23,198,1,247,22,151,16,27,248,22,160,20,23,198,1,28,248, 22,90,23,194,2,9,27,248,80,144,46,53,39,248,22,83,23,196,2,28,23, 193,2,249,22,82,248,22,137,16,249,22,135,16,23,198,1,247,22,151,16,248, -80,144,48,8,53,39,248,22,159,20,23,198,1,86,94,23,193,1,248,80,144, -46,8,53,39,248,22,159,20,23,196,1,86,94,23,193,1,27,248,22,159,20, +80,144,48,8,53,39,248,22,160,20,23,198,1,86,94,23,193,1,248,80,144, +46,8,53,39,248,22,160,20,23,196,1,86,94,23,193,1,27,248,22,160,20, 23,196,1,28,248,22,90,23,194,2,9,27,248,80,144,44,53,39,248,22,83, 23,196,2,28,23,193,2,249,22,82,248,22,137,16,249,22,135,16,23,198,1, -247,22,151,16,248,80,144,46,8,53,39,248,22,159,20,23,198,1,86,94,23, -193,1,248,80,144,44,8,53,39,248,22,159,20,23,196,1,86,94,23,193,1, -27,248,22,159,20,23,197,1,28,248,22,90,23,194,2,9,27,27,248,22,83, +247,22,151,16,248,80,144,46,8,53,39,248,22,160,20,23,198,1,86,94,23, +193,1,248,80,144,44,8,53,39,248,22,160,20,23,196,1,86,94,23,193,1, +27,248,22,160,20,23,197,1,28,248,22,90,23,194,2,9,27,27,248,22,83, 23,196,2,28,248,22,134,16,23,194,2,248,22,137,16,23,194,1,28,248,22, 133,16,23,194,2,90,144,39,11,89,146,39,36,11,248,22,130,16,249,22,135, 16,250,80,144,49,40,39,248,22,150,16,2,57,11,11,248,22,150,16,2,58, 86,95,23,195,1,23,194,1,248,22,137,16,249,22,135,16,23,199,1,23,196, 1,27,250,80,144,44,40,39,248,22,150,16,2,57,23,197,1,10,28,23,193, 2,248,22,137,16,23,194,1,11,28,23,193,2,249,22,82,248,22,137,16,249, -22,135,16,23,198,1,247,22,151,16,27,248,22,159,20,23,198,1,28,248,22, +22,135,16,23,198,1,247,22,151,16,27,248,22,160,20,23,198,1,28,248,22, 90,23,194,2,9,27,248,80,144,44,53,39,248,22,83,23,196,2,28,23,193, 2,249,22,82,248,22,137,16,249,22,135,16,23,198,1,247,22,151,16,248,80, -144,46,8,53,39,248,22,159,20,23,198,1,86,94,23,193,1,248,80,144,44, -8,53,39,248,22,159,20,23,196,1,86,94,23,193,1,27,248,22,159,20,23, +144,46,8,53,39,248,22,160,20,23,198,1,86,94,23,193,1,248,80,144,44, +8,53,39,248,22,160,20,23,196,1,86,94,23,193,1,27,248,22,160,20,23, 196,1,28,248,22,90,23,194,2,9,27,248,80,144,42,53,39,248,22,83,23, 196,2,28,23,193,2,249,22,82,248,22,137,16,249,22,135,16,23,198,1,247, -22,151,16,248,80,144,44,8,53,39,248,22,159,20,23,198,1,86,94,23,193, -1,248,80,144,42,8,53,39,248,22,159,20,23,196,1,27,247,22,157,16,27, +22,151,16,248,80,144,44,8,53,39,248,22,160,20,23,198,1,86,94,23,193, +1,248,80,144,42,8,53,39,248,22,160,20,23,196,1,27,247,22,158,16,27, 248,80,144,39,55,39,247,80,144,39,54,39,249,80,144,40,41,38,28,23,196, 2,27,249,22,176,8,247,22,175,8,2,76,28,192,249,22,166,8,194,7,63, 2,67,2,67,250,80,144,43,59,39,23,198,2,2,77,27,28,23,200,1,250, 22,191,15,248,22,150,16,2,62,250,22,160,2,23,205,1,2,60,247,22,172, 8,2,78,86,94,23,199,1,11,27,248,80,144,46,8,50,39,250,22,96,9, 248,22,92,248,22,150,16,2,56,9,28,193,249,22,82,195,194,192,27,247,22, -157,16,27,248,80,144,39,55,39,247,80,144,39,54,39,249,80,144,40,41,38, +158,16,27,248,80,144,39,55,39,247,80,144,39,54,39,249,80,144,40,41,38, 28,23,196,2,27,249,22,176,8,247,22,175,8,2,76,28,192,249,22,166,8, 194,7,63,2,67,2,67,250,80,144,43,59,39,23,198,2,2,77,27,28,23, 200,1,250,22,191,15,248,22,150,16,2,62,250,22,160,2,23,205,1,2,60, 247,22,172,8,2,78,86,94,23,199,1,11,27,248,80,144,46,8,51,39,250, 22,96,23,207,1,248,22,92,248,22,150,16,2,56,9,28,193,249,22,82,195, -194,192,27,247,22,157,16,27,248,80,144,39,55,39,249,80,144,41,52,37,37, +194,192,27,247,22,158,16,27,248,80,144,39,55,39,249,80,144,41,52,37,37, 80,144,41,8,52,39,249,80,144,40,41,38,28,23,196,2,27,249,22,176,8, 247,22,175,8,2,76,28,192,249,22,166,8,194,7,63,2,67,2,67,250,80, 144,43,59,39,23,198,2,2,77,27,28,23,200,1,250,22,191,15,248,22,150, @@ -920,15 +920,15 @@ 194,1,248,22,137,16,249,22,135,16,23,199,1,23,196,1,27,250,80,144,52, 40,39,248,22,150,16,2,57,23,197,1,10,28,23,193,2,248,22,137,16,23, 194,1,11,28,23,193,2,249,22,82,248,22,137,16,249,22,135,16,23,198,1, -247,22,151,16,27,248,22,159,20,23,198,1,28,248,22,90,23,194,2,9,27, +247,22,151,16,27,248,22,160,20,23,198,1,28,248,22,90,23,194,2,9,27, 248,80,144,52,53,39,248,22,83,23,196,2,28,23,193,2,249,22,82,248,22, 137,16,249,22,135,16,23,198,1,247,22,151,16,248,80,144,54,8,53,39,248, -22,159,20,23,198,1,86,94,23,193,1,248,80,144,52,8,53,39,248,22,159, -20,23,196,1,86,94,23,193,1,27,248,22,159,20,23,196,1,28,248,22,90, +22,160,20,23,198,1,86,94,23,193,1,248,80,144,52,8,53,39,248,22,160, +20,23,196,1,86,94,23,193,1,27,248,22,160,20,23,196,1,28,248,22,90, 23,194,2,9,27,248,80,144,50,53,39,248,22,83,23,196,2,28,23,193,2, 249,22,82,248,22,137,16,249,22,135,16,23,198,1,247,22,151,16,248,80,144, -52,8,53,39,248,22,159,20,23,198,1,86,94,23,193,1,248,80,144,50,8, -53,39,248,22,159,20,23,196,1,28,193,249,22,82,195,194,192,27,20,13,144, +52,8,53,39,248,22,160,20,23,198,1,86,94,23,193,1,248,80,144,50,8, +53,39,248,22,160,20,23,196,1,28,193,249,22,82,195,194,192,27,20,13,144, 80,144,37,43,37,26,9,80,144,46,44,37,249,22,33,11,80,144,48,43,37, 22,147,15,10,22,154,15,10,22,155,15,10,22,156,15,10,248,22,149,6,23, 196,2,28,248,22,149,7,23,194,2,12,86,94,248,22,178,9,23,194,1,27, @@ -971,7 +971,7 @@ 38,2,5,223,0,33,86,80,144,36,39,37,20,15,16,2,20,25,96,2,6, 88,148,8,36,39,8,24,8,32,9,223,0,33,93,88,148,8,36,38,47,52, 9,223,0,33,94,88,148,8,36,37,46,52,9,223,0,33,95,80,144,36,40, -37,20,15,16,2,27,248,22,161,16,248,22,168,8,27,28,249,22,170,9,247, +37,20,15,16,2,27,248,22,162,16,248,22,168,8,27,28,249,22,170,9,247, 22,181,8,2,44,6,1,1,59,6,1,1,58,250,22,138,8,6,14,14,40, 91,94,126,97,93,42,41,126,97,40,46,42,41,23,196,2,23,196,1,88,148, 8,36,38,48,11,2,7,223,0,33,99,80,144,36,41,37,20,15,16,2,88, @@ -1044,7 +1044,7 @@ EVAL_ONE_SIZED_STR((char *)expr, 19746); } { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,55,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,14,0,0,0,1,0,0,15,0,40,0, 57,0,75,0,97,0,120,0,140,0,162,0,171,0,180,0,187,0,196,0,203, 0,0,0,231,1,0,0,74,35,37,112,108,97,99,101,45,115,116,114,117,99, @@ -1074,7 +1074,7 @@ EVAL_ONE_SIZED_STR((char *)expr, 557); } { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,55,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,102,0,0,0,1,0,0,7,0,18,0, 45,0,51,0,60,0,67,0,89,0,102,0,128,0,145,0,167,0,175,0,187, 0,202,0,218,0,236,0,0,1,12,1,28,1,51,1,75,1,87,1,118,1, @@ -1139,14 +1139,14 @@ 80,144,37,40,39,23,195,2,12,250,22,180,11,2,27,6,12,12,112,97,116, 104,45,115,116,114,105,110,103,63,23,197,2,28,28,23,195,2,28,248,22,66, 23,196,2,10,28,248,22,91,23,196,2,28,249,22,132,4,248,22,95,23,198, -2,37,28,28,248,22,66,248,22,83,23,197,2,10,248,22,168,9,248,22,158, -20,23,197,2,249,22,4,22,66,248,22,159,20,23,198,2,11,11,11,10,12, +2,37,28,28,248,22,66,248,22,83,23,197,2,10,248,22,168,9,248,22,159, +20,23,197,2,249,22,4,22,66,248,22,160,20,23,198,2,11,11,11,10,12, 250,22,180,11,2,27,6,71,71,40,111,114,47,99,32,35,102,32,115,121,109, 98,111,108,63,32,40,99,111,110,115,47,99,32,40,111,114,47,99,32,35,102, 32,115,121,109,98,111,108,63,41,32,40,110,111,110,45,101,109,112,116,121,45, 108,105,115,116,111,102,32,115,121,109,98,111,108,63,41,41,41,23,197,2,27, 28,23,196,2,247,22,128,5,11,27,28,23,194,2,250,22,160,2,80,143,41, -41,248,22,190,16,247,22,143,14,11,11,27,28,23,194,2,250,22,160,2,248, +41,248,22,191,16,247,22,143,14,11,11,27,28,23,194,2,250,22,160,2,248, 22,84,23,198,2,23,198,2,11,11,28,23,193,2,86,96,23,197,1,23,195, 1,23,194,1,20,13,144,80,144,39,38,37,250,80,144,42,39,37,249,22,33, 11,80,144,44,38,37,22,129,5,248,22,104,23,197,2,27,248,22,113,23,195, @@ -1165,8 +1165,8 @@ 146,37,43,11,28,23,198,2,28,249,22,170,9,23,200,2,23,197,1,23,193, 1,86,94,23,193,1,249,22,191,15,23,196,2,23,200,2,86,94,23,195,1, 11,89,146,37,44,11,28,249,22,170,9,23,196,2,68,114,101,108,97,116,105, -118,101,86,94,23,194,1,2,29,23,194,1,89,146,37,45,11,247,22,155,16, -89,146,37,46,11,247,22,156,16,27,250,22,145,16,23,203,2,11,32,0,88, +118,101,86,94,23,194,1,2,29,23,194,1,89,146,37,45,11,247,22,156,16, +89,146,37,46,11,247,22,157,16,27,250,22,145,16,23,203,2,11,32,0,88, 148,8,36,36,41,11,9,222,11,27,28,23,194,2,249,22,82,23,203,2,23, 196,1,86,94,23,194,1,11,27,28,23,203,2,28,23,194,2,11,27,250,22, 145,16,23,207,2,11,32,0,88,148,8,36,36,41,11,9,222,11,28,192,249, @@ -1181,7 +1181,7 @@ 80,144,57,38,37,250,80,144,8,24,39,37,249,22,33,11,80,144,8,26,38, 37,22,129,5,11,20,13,144,80,144,57,38,37,250,80,144,8,24,39,37,249, 22,33,11,80,144,8,26,38,37,22,178,5,28,248,22,173,15,23,212,2,23, -211,1,86,94,23,211,1,247,22,151,16,249,247,22,160,16,248,22,83,23,196, +211,1,86,94,23,211,1,247,22,151,16,249,247,22,161,16,248,22,83,23,196, 1,23,218,1,86,94,23,193,1,27,28,23,195,2,27,249,22,5,88,148,36, 37,48,8,129,3,9,226,25,20,19,16,33,47,23,214,2,27,28,23,200,2, 11,193,28,192,192,28,193,28,199,28,249,22,134,4,248,22,84,196,248,22,84, @@ -1190,7 +1190,7 @@ 20,13,144,80,144,58,38,37,250,80,144,8,25,39,37,249,22,33,11,80,144, 8,27,38,37,22,129,5,23,211,1,20,13,144,80,144,58,38,37,250,80,144, 8,25,39,37,249,22,33,11,80,144,8,27,38,37,22,178,5,28,248,22,173, -15,23,213,2,23,212,1,86,94,23,212,1,247,22,151,16,249,247,22,160,16, +15,23,213,2,23,212,1,86,94,23,212,1,247,22,151,16,249,247,22,161,16, 248,22,83,23,196,1,23,219,1,86,94,23,193,1,27,28,23,197,2,27,249, 22,5,20,20,94,88,148,36,37,48,8,128,3,9,226,26,21,20,16,33,49, 23,209,1,23,215,2,27,28,23,200,2,11,193,28,192,192,28,193,28,23,200, @@ -1202,7 +1202,7 @@ 26,39,37,249,22,33,11,80,144,8,28,38,37,22,129,5,11,20,13,144,80, 144,59,38,37,250,80,144,8,26,39,37,249,22,33,11,80,144,8,28,38,37, 22,178,5,28,248,22,173,15,23,214,2,23,213,1,86,94,23,213,1,247,22, -151,16,249,247,22,176,5,248,22,158,20,23,196,1,23,220,1,86,94,23,193, +151,16,249,247,22,176,5,248,22,159,20,23,196,1,23,220,1,86,94,23,193, 1,27,28,23,197,1,27,249,22,5,20,20,95,88,148,36,37,48,8,128,3, 9,226,27,22,21,18,33,51,23,211,1,23,215,1,23,216,1,27,28,23,201, 2,11,193,28,192,192,28,193,28,200,28,249,22,134,4,248,22,84,196,248,22, @@ -1213,8 +1213,8 @@ 37,249,22,33,11,80,144,8,29,38,37,22,129,5,23,213,1,20,13,144,80, 144,8,24,38,37,250,80,144,8,27,39,37,249,22,33,11,80,144,8,29,38, 37,22,178,5,28,248,22,173,15,23,215,2,23,214,1,86,94,23,214,1,247, -22,151,16,249,247,22,176,5,248,22,158,20,23,196,1,23,221,1,86,94,23, -193,1,28,28,248,22,80,23,220,2,248,22,158,20,23,220,2,10,27,28,23, +22,151,16,249,247,22,176,5,248,22,159,20,23,196,1,23,221,1,86,94,23, +193,1,28,28,248,22,80,23,220,2,248,22,159,20,23,220,2,10,27,28,23, 199,2,86,94,23,211,1,23,210,1,86,94,23,210,1,23,211,1,28,28,248, 22,80,23,221,2,248,22,168,9,248,22,185,15,23,195,2,11,12,20,13,144, 80,144,8,25,38,37,250,80,144,8,28,39,37,249,22,33,11,80,144,8,30, @@ -1285,21 +1285,21 @@ 200,2,36,23,198,2,248,2,58,249,22,176,7,23,200,1,248,22,183,3,23, 199,1,250,2,56,23,197,4,197,248,22,183,3,196,32,72,88,148,36,37,55, 11,2,33,222,33,73,28,248,22,90,248,22,84,23,195,2,249,22,7,9,248, -22,158,20,23,196,1,90,144,38,11,89,146,38,36,11,27,248,22,159,20,23, -197,2,28,248,22,90,248,22,84,23,195,2,249,22,7,9,248,22,158,20,195, -90,144,38,11,89,146,38,36,11,27,248,22,159,20,196,28,248,22,90,248,22, -84,23,195,2,249,22,7,9,248,22,158,20,195,90,144,38,11,89,146,38,36, -11,248,2,72,248,22,159,20,196,249,22,7,249,22,82,248,22,158,20,199,196, -195,249,22,7,249,22,82,248,22,158,20,199,196,195,249,22,7,249,22,82,248, -22,158,20,23,200,1,23,197,1,23,196,1,27,19,248,22,157,7,23,196,2, +22,159,20,23,196,1,90,144,38,11,89,146,38,36,11,27,248,22,160,20,23, +197,2,28,248,22,90,248,22,84,23,195,2,249,22,7,9,248,22,159,20,195, +90,144,38,11,89,146,38,36,11,27,248,22,160,20,196,28,248,22,90,248,22, +84,23,195,2,249,22,7,9,248,22,159,20,195,90,144,38,11,89,146,38,36, +11,248,2,72,248,22,160,20,196,249,22,7,249,22,82,248,22,159,20,199,196, +195,249,22,7,249,22,82,248,22,159,20,199,196,195,249,22,7,249,22,82,248, +22,159,20,23,200,1,23,197,1,23,196,1,27,19,248,22,157,7,23,196,2, 250,2,56,23,196,4,23,198,1,36,2,28,23,195,1,192,28,248,22,90,248, -22,84,23,195,2,249,22,7,9,248,22,158,20,23,196,1,27,248,22,159,20, +22,84,23,195,2,249,22,7,9,248,22,159,20,23,196,1,27,248,22,160,20, 23,195,2,90,144,38,11,89,146,38,36,11,28,248,22,90,248,22,84,23,197, -2,249,22,7,9,248,22,158,20,23,198,1,27,248,22,159,20,23,197,2,90, +2,249,22,7,9,248,22,159,20,23,198,1,27,248,22,160,20,23,197,2,90, 144,38,11,89,146,38,36,11,28,248,22,90,248,22,84,23,197,2,249,22,7, -9,248,22,158,20,197,90,144,38,11,89,146,38,36,11,248,2,72,248,22,159, -20,198,249,22,7,249,22,82,248,22,158,20,201,196,195,249,22,7,249,22,82, -248,22,158,20,23,203,1,196,195,249,22,7,249,22,82,248,22,158,20,23,201, +9,248,22,159,20,197,90,144,38,11,89,146,38,36,11,248,2,72,248,22,160, +20,198,249,22,7,249,22,82,248,22,159,20,201,196,195,249,22,7,249,22,82, +248,22,159,20,23,203,1,196,195,249,22,7,249,22,82,248,22,159,20,23,201, 1,23,197,1,23,196,1,248,22,142,12,252,22,162,10,248,22,165,4,23,200, 2,248,22,161,4,23,200,2,248,22,162,4,23,200,2,248,22,163,4,23,200, 2,248,22,164,4,23,200,1,28,24,194,2,12,20,13,144,80,144,36,58,37, @@ -1308,12 +1308,12 @@ 108,97,110,101,116,45,109,111,100,117,108,101,45,110,97,109,101,45,114,101,115, 111,108,118,101,114,12,27,28,23,195,2,28,249,22,170,9,23,197,2,80,143, 39,52,86,94,23,195,1,80,143,37,53,27,248,22,154,5,23,197,2,27,28, -248,22,80,23,195,2,248,22,158,20,23,195,1,23,194,1,28,248,22,173,15, +248,22,80,23,195,2,248,22,159,20,23,195,1,23,194,1,28,248,22,173,15, 23,194,2,90,144,39,11,89,146,39,36,11,248,22,130,16,23,197,1,86,95, 20,18,144,11,80,143,42,52,199,20,18,144,11,80,143,42,53,192,192,11,11, 28,23,193,2,192,86,94,23,193,1,27,247,22,178,5,28,23,193,2,192,86, 94,23,193,1,247,22,151,16,90,144,39,11,89,146,39,36,11,248,22,130,16, -23,198,2,86,95,23,195,1,23,193,1,28,249,22,165,16,0,11,35,114,120, +23,198,2,86,95,23,195,1,23,193,1,28,249,22,166,16,0,11,35,114,120, 34,91,46,93,115,115,36,34,248,22,178,15,23,197,1,249,80,144,41,59,39, 23,199,1,2,28,196,249,80,144,38,54,39,195,10,249,22,14,23,196,1,80, 144,38,51,38,86,96,28,248,22,152,5,23,196,2,12,250,22,180,11,2,23, @@ -1321,15 +1321,15 @@ 116,104,63,23,198,2,28,28,23,196,2,248,22,144,14,23,197,2,10,12,250, 22,180,11,2,23,6,20,20,40,111,114,47,99,32,35,102,32,110,97,109,101, 115,112,97,99,101,63,41,23,199,2,28,24,193,2,248,24,194,1,23,196,2, -86,94,23,193,1,12,27,250,22,160,2,80,144,41,41,38,248,22,190,16,247, +86,94,23,193,1,12,27,250,22,160,2,80,144,41,41,38,248,22,191,16,247, 22,143,14,11,27,28,23,194,2,23,194,1,86,94,23,194,1,27,249,22,82, 247,22,140,2,247,22,140,2,86,94,250,22,158,2,80,144,43,41,38,248,22, -190,16,247,22,143,14,195,192,86,94,250,22,158,2,248,22,83,23,197,2,23, +191,16,247,22,143,14,195,192,86,94,250,22,158,2,248,22,83,23,197,2,23, 200,2,68,100,101,99,108,97,114,101,100,28,23,198,2,27,28,248,22,80,248, 22,154,5,23,200,2,248,22,153,5,248,22,83,248,22,154,5,23,201,1,23, -198,1,27,250,22,160,2,80,144,44,41,38,248,22,190,16,23,204,1,11,28, +198,1,27,250,22,160,2,80,144,44,41,38,248,22,191,16,23,204,1,11,28, 23,193,2,27,250,22,160,2,248,22,84,23,198,1,23,198,2,11,28,23,193, -2,250,22,158,2,248,22,159,20,23,200,1,23,198,1,23,196,1,12,12,12, +2,250,22,158,2,248,22,160,20,23,200,1,23,198,1,23,196,1,12,12,12, 86,94,251,22,137,12,247,22,141,12,65,101,114,114,111,114,6,69,69,100,101, 102,97,117,108,116,32,109,111,100,117,108,101,32,110,97,109,101,32,114,101,115, 111,108,118,101,114,32,99,97,108,108,101,100,32,119,105,116,104,32,116,104,114, @@ -1344,11 +1344,11 @@ 97,116,104,58,32,126,46,115,250,22,93,2,36,28,249,22,172,9,23,201,2, 2,38,23,199,1,28,248,22,173,15,23,200,2,23,199,1,249,22,92,28,248, 22,66,23,202,2,2,4,2,39,23,201,1,23,200,1,251,2,84,196,197,248, -22,84,199,248,22,159,20,200,251,2,84,196,197,249,22,82,248,22,158,20,202, -200,248,22,159,20,200,251,2,84,196,197,9,197,27,250,22,177,7,27,28,23, +22,84,199,248,22,160,20,200,251,2,84,196,197,249,22,82,248,22,159,20,202, +200,248,22,160,20,200,251,2,84,196,197,9,197,27,250,22,177,7,27,28,23, 199,2,28,247,22,129,12,248,80,144,44,55,39,23,200,2,11,11,28,192,192, 6,29,29,115,116,97,110,100,97,114,100,45,109,111,100,117,108,101,45,110,97, -109,101,45,114,101,115,111,108,118,101,114,6,2,2,58,32,250,22,176,16,0, +109,101,45,114,101,115,111,108,118,101,114,6,2,2,58,32,250,22,177,16,0, 7,35,114,120,34,92,110,34,23,203,1,249,22,138,8,6,23,23,10,32,32, 102,111,114,32,109,111,100,117,108,101,32,112,97,116,104,58,32,126,115,10,23, 202,2,248,22,172,13,28,23,196,2,251,22,180,12,23,198,1,247,22,29,248, @@ -1363,7 +1363,7 @@ 0,8,35,114,120,34,91,46,93,34,32,92,88,148,8,36,37,47,11,2,33, 222,33,93,28,248,22,90,23,194,2,9,250,22,93,6,4,4,10,32,32,32, 248,22,177,15,248,22,105,23,198,2,248,2,92,248,22,84,23,198,1,28,249, -22,172,9,248,22,84,23,200,2,23,197,1,28,249,22,170,9,248,22,158,20, +22,172,9,248,22,84,23,200,2,23,197,1,28,249,22,170,9,248,22,159,20, 23,200,1,23,196,1,251,22,176,11,2,23,6,41,41,99,121,99,108,101,32, 105,110,32,108,111,97,100,105,110,103,10,32,32,97,116,32,112,97,116,104,58, 32,126,97,10,32,32,112,97,116,104,115,58,126,97,23,200,1,249,22,1,22, @@ -1373,11 +1373,11 @@ 33,11,80,144,53,38,37,22,128,5,23,201,2,22,130,5,248,28,23,208,2, 20,20,94,88,148,8,36,37,46,11,9,223,15,33,96,23,208,1,86,94,23, 208,1,22,7,28,248,22,66,23,207,2,23,206,1,28,28,248,22,80,23,207, -2,249,22,170,9,248,22,158,20,23,209,2,2,34,11,23,206,1,86,94,23, +2,249,22,170,9,248,22,159,20,23,209,2,2,34,11,23,206,1,86,94,23, 206,1,28,248,22,152,5,23,203,2,27,248,22,154,5,23,204,2,28,248,22, 66,193,249,22,92,2,4,194,192,23,202,2,249,247,22,177,5,23,201,1,27, 248,22,70,248,22,177,15,23,202,1,28,23,204,2,28,250,22,160,2,248,22, -158,20,23,202,1,23,202,1,11,249,22,82,11,205,249,22,82,194,205,192,86, +159,20,23,202,1,23,202,1,11,249,22,82,11,205,249,22,82,194,205,192,86, 96,28,248,22,162,5,23,196,2,12,28,248,22,157,4,23,198,2,250,22,178, 11,11,6,15,15,98,97,100,32,109,111,100,117,108,101,32,112,97,116,104,23, 200,2,250,22,180,11,2,23,2,35,23,198,2,28,28,23,196,2,248,22,152, @@ -1386,45 +1386,45 @@ 116,104,63,41,23,199,2,28,28,23,197,2,248,22,157,4,23,198,2,10,12, 250,22,180,11,2,23,6,17,17,40,111,114,47,99,32,35,102,32,115,121,110, 116,97,120,63,41,23,200,2,28,28,248,22,80,23,196,2,249,22,170,9,248, -22,158,20,23,198,2,2,4,11,86,97,23,198,1,23,197,1,23,196,1,23, +22,159,20,23,198,2,2,4,11,86,97,23,198,1,23,197,1,23,196,1,23, 193,1,248,22,153,5,248,22,104,23,197,1,28,28,248,22,80,23,196,2,28, -249,22,170,9,248,22,158,20,23,198,2,2,36,28,248,22,80,248,22,104,23, +249,22,170,9,248,22,159,20,23,198,2,2,36,28,248,22,80,248,22,104,23, 197,2,249,22,170,9,248,22,108,23,198,2,2,4,11,11,11,86,97,23,198, 1,23,197,1,23,196,1,23,193,1,248,22,153,5,249,2,83,248,22,121,23, 199,2,248,22,106,23,199,1,28,28,248,22,80,23,196,2,28,249,22,170,9, -248,22,158,20,23,198,2,2,36,28,28,249,22,172,9,248,22,104,23,198,2, +248,22,159,20,23,198,2,2,36,28,28,249,22,172,9,248,22,104,23,198,2, 2,38,10,249,22,172,9,248,22,104,23,198,2,2,37,28,23,196,2,27,248, 22,154,5,23,198,2,28,248,22,66,193,10,28,248,22,80,193,248,22,66,248, -22,158,20,194,11,11,11,11,11,86,96,23,198,1,23,197,1,23,193,1,27, +22,159,20,194,11,11,11,11,11,86,96,23,198,1,23,197,1,23,193,1,27, 248,22,154,5,23,198,1,248,22,153,5,249,2,83,28,248,22,80,23,197,2, -248,22,158,20,23,197,2,23,196,2,27,28,249,22,172,9,248,22,104,23,203, -2,2,37,248,22,159,20,200,248,22,106,200,28,248,22,80,23,198,2,249,22, -96,248,22,159,20,199,194,192,28,28,248,22,80,23,196,2,249,22,170,9,248, -22,158,20,23,198,2,2,40,11,86,94,248,80,144,38,8,29,39,23,194,2, +248,22,159,20,23,197,2,23,196,2,27,28,249,22,172,9,248,22,104,23,203, +2,2,37,248,22,160,20,200,248,22,106,200,28,248,22,80,23,198,2,249,22, +96,248,22,160,20,199,194,192,28,28,248,22,80,23,196,2,249,22,170,9,248, +22,159,20,23,198,2,2,40,11,86,94,248,80,144,38,8,29,39,23,194,2, 253,24,199,1,23,201,1,23,202,1,23,203,1,23,204,1,11,80,143,43,56, -28,28,248,22,80,23,196,2,28,249,22,170,9,248,22,158,20,23,198,2,2, +28,28,248,22,80,23,196,2,28,249,22,170,9,248,22,159,20,23,198,2,2, 36,28,248,22,80,248,22,104,23,197,2,249,22,170,9,248,22,108,23,198,2, 2,40,11,11,11,86,94,248,80,144,38,8,29,39,23,194,2,253,24,199,1, 248,22,104,23,202,2,23,202,1,23,203,1,23,204,1,248,22,106,23,202,1, 80,143,43,56,86,94,23,193,1,27,88,148,8,36,37,54,8,240,0,0,8, 0,79,115,104,111,119,45,99,111,108,108,101,99,116,105,111,110,45,101,114,114, 225,2,5,3,33,87,27,28,248,22,80,23,198,2,28,249,22,170,9,2,36, -248,22,158,20,23,200,2,27,248,22,104,23,199,2,28,28,249,22,172,9,23, +248,22,159,20,23,200,2,27,248,22,104,23,199,2,28,28,249,22,172,9,23, 195,2,2,38,10,249,22,172,9,23,195,2,2,37,86,94,23,193,1,28,23, -199,2,27,248,22,154,5,23,201,2,28,248,22,80,193,248,22,158,20,193,192, +199,2,27,248,22,154,5,23,201,2,28,248,22,80,193,248,22,159,20,193,192, 250,22,176,11,2,23,6,45,45,110,111,32,98,97,115,101,32,112,97,116,104, 32,102,111,114,32,114,101,108,97,116,105,118,101,32,115,117,98,109,111,100,117, 108,101,32,112,97,116,104,58,32,126,46,115,23,201,2,192,23,197,2,23,197, -2,27,28,248,22,80,23,199,2,28,249,22,170,9,2,36,248,22,158,20,23, +2,27,28,248,22,80,23,199,2,28,249,22,170,9,2,36,248,22,159,20,23, 201,2,27,28,28,28,249,22,172,9,248,22,104,23,202,2,2,38,10,249,22, 172,9,248,22,104,23,202,2,2,37,23,200,2,11,27,248,22,154,5,23,202, -2,27,28,249,22,172,9,248,22,104,23,204,2,2,37,248,22,159,20,23,202, -1,248,22,106,23,202,1,28,248,22,80,23,195,2,249,2,83,248,22,158,20, -23,197,2,249,22,96,248,22,159,20,23,199,1,23,197,1,249,2,83,23,196, +2,27,28,249,22,172,9,248,22,104,23,204,2,2,37,248,22,160,20,23,202, +1,248,22,106,23,202,1,28,248,22,80,23,195,2,249,2,83,248,22,159,20, +23,197,2,249,22,96,248,22,160,20,23,199,1,23,197,1,249,2,83,23,196, 1,23,195,1,249,2,83,2,38,28,249,22,172,9,248,22,104,23,204,2,2, -37,248,22,159,20,23,202,1,248,22,106,23,202,1,28,248,22,80,193,248,22, -159,20,193,11,11,11,27,28,248,22,66,23,196,2,27,248,80,144,43,48,39, -249,22,82,23,199,2,248,22,190,16,247,22,143,14,28,23,193,2,192,86,94, +37,248,22,160,20,23,202,1,248,22,106,23,202,1,28,248,22,80,193,248,22, +160,20,193,11,11,11,27,28,248,22,66,23,196,2,27,248,80,144,43,48,39, +249,22,82,23,199,2,248,22,191,16,247,22,143,14,28,23,193,2,192,86,94, 23,193,1,90,144,38,11,89,146,38,36,11,249,80,144,46,54,39,248,22,73, 23,201,2,11,27,28,248,22,90,23,195,2,2,41,249,22,177,7,23,197,2, 2,42,252,80,144,50,8,24,39,23,205,1,28,248,22,90,23,200,2,23,200, @@ -1439,18 +1439,18 @@ 1,28,248,22,173,15,23,196,2,86,94,23,196,1,248,80,144,42,8,31,39, 248,22,137,16,28,248,22,134,16,23,198,2,23,197,2,249,22,135,16,23,199, 2,248,80,144,46,8,30,39,23,205,2,28,249,22,170,9,248,22,83,23,198, -2,2,34,27,248,80,144,43,48,39,249,22,82,23,199,2,248,22,190,16,247, +2,2,34,27,248,80,144,43,48,39,249,22,82,23,199,2,248,22,191,16,247, 22,143,14,28,23,193,2,192,86,94,23,193,1,90,144,39,11,89,146,38,36, 11,249,80,144,47,54,39,248,22,104,23,202,2,11,89,146,37,38,11,28,248, -22,90,248,22,106,23,201,2,28,248,22,90,23,194,2,249,22,169,16,2,91, +22,90,248,22,106,23,201,2,28,248,22,90,23,194,2,249,22,170,16,2,91, 23,196,2,11,10,27,28,23,196,2,248,2,88,23,196,2,28,248,22,90,23, -195,2,2,41,28,249,22,169,16,2,91,23,197,2,248,2,88,23,196,2,249, +195,2,2,41,28,249,22,170,16,2,91,23,197,2,248,2,88,23,196,2,249, 22,177,7,23,197,2,2,42,27,28,23,197,1,86,94,23,196,1,249,22,96, 28,248,22,90,248,22,106,23,205,2,21,93,6,5,5,109,122,108,105,98,249, 22,1,22,96,249,22,2,80,144,53,8,32,39,248,22,106,23,208,2,23,197, 1,28,248,22,90,23,196,2,86,94,23,195,1,248,22,92,23,197,1,86,94, 23,196,1,23,195,1,252,80,144,52,8,24,39,23,207,1,248,22,83,23,199, -2,248,22,159,20,23,199,1,23,199,1,10,28,249,22,170,9,248,22,158,20, +2,248,22,160,20,23,199,1,23,199,1,10,28,249,22,170,9,248,22,159,20, 23,198,2,2,39,248,80,144,42,8,31,39,248,22,137,16,249,22,135,16,248, 22,139,16,248,22,104,23,201,2,248,80,144,46,8,30,39,23,205,2,12,86, 94,28,28,248,22,173,15,23,194,2,10,248,22,185,8,23,194,2,12,28,23, @@ -1465,23 +1465,23 @@ 27,28,248,22,185,8,23,200,2,249,22,190,8,23,201,2,39,249,80,144,49, 59,39,23,197,2,5,0,27,28,248,22,185,8,23,201,2,249,22,190,8,23, 202,2,40,248,22,153,5,23,200,2,27,250,22,160,2,80,144,52,41,38,248, -22,190,16,247,22,143,14,11,27,28,23,194,2,23,194,1,86,94,23,194,1, +22,191,16,247,22,143,14,11,27,28,23,194,2,23,194,1,86,94,23,194,1, 27,249,22,82,247,22,140,2,247,22,140,2,86,94,250,22,158,2,80,144,54, -41,38,248,22,190,16,247,22,143,14,195,192,27,28,23,204,2,248,22,153,5, +41,38,248,22,191,16,247,22,143,14,195,192,27,28,23,204,2,248,22,153,5, 249,22,82,248,22,154,5,23,200,2,23,207,2,23,196,2,86,95,28,23,212, 2,28,250,22,160,2,248,22,83,23,198,2,195,11,86,96,23,211,1,23,204, 1,23,194,1,12,27,251,22,33,11,80,144,56,50,38,9,28,248,22,17,80, -144,57,51,38,80,144,56,51,38,247,22,19,27,248,22,190,16,247,22,143,14, +144,57,51,38,80,144,56,51,38,247,22,19,27,248,22,191,16,247,22,143,14, 86,94,249,22,3,88,148,8,36,37,54,11,9,226,13,12,2,3,33,94,23, 196,2,248,28,248,22,17,80,144,55,51,38,32,0,88,148,36,37,42,11,9, 222,33,95,80,144,54,8,33,39,20,20,98,88,148,36,36,8,25,8,240,12, 64,0,0,9,233,18,21,14,15,12,11,7,6,4,1,2,33,97,23,195,1, 23,194,1,23,197,1,23,207,1,23,214,1,12,28,28,248,22,185,8,23,204, 1,86,94,23,212,1,11,28,23,212,1,28,248,22,154,7,23,206,2,10,28, -248,22,66,23,206,2,10,28,248,22,80,23,206,2,249,22,170,9,248,22,158, +248,22,66,23,206,2,10,28,248,22,80,23,206,2,249,22,170,9,248,22,159, 20,23,208,2,2,34,11,11,249,80,144,53,49,39,28,248,22,154,7,23,208, 2,249,22,82,23,209,1,248,80,144,56,8,30,39,23,215,1,86,94,23,212, -1,249,22,82,23,209,1,248,22,190,16,247,22,143,14,252,22,187,8,23,209, +1,249,22,82,23,209,1,248,22,191,16,247,22,143,14,252,22,187,8,23,209, 1,23,208,1,23,206,1,23,204,1,23,203,1,12,192,86,96,20,18,144,11, 80,143,36,56,248,80,144,37,8,28,37,249,22,33,11,80,144,39,58,37,248, 22,191,4,80,144,37,57,38,248,22,177,5,80,144,37,37,39,248,22,142,15, @@ -1541,7 +1541,7 @@ EVAL_ONE_SIZED_STR((char *)expr, 9735); } { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,55,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,11,0,0,0,1,0,0,10,0,16,0, 29,0,44,0,58,0,78,0,90,0,104,0,118,0,170,0,0,0,101,1,0, 0,69,35,37,98,117,105,108,116,105,110,65,113,117,111,116,101,29,94,2,2, @@ -1549,7 +1549,7 @@ 114,107,11,29,94,2,2,68,35,37,112,97,114,97,109,122,11,29,94,2,2, 74,35,37,112,108,97,99,101,45,115,116,114,117,99,116,11,29,94,2,2,66, 35,37,98,111,111,116,11,29,94,2,2,68,35,37,101,120,112,111,98,115,11, -29,94,2,2,68,35,37,107,101,114,110,101,108,11,97,36,11,8,240,160,91, +29,94,2,2,68,35,37,107,101,114,110,101,108,11,97,36,11,8,240,161,91, 0,0,100,144,2,3,36,36,144,2,4,36,36,144,2,5,36,36,144,2,6, 36,36,144,2,7,36,36,144,2,8,36,36,144,2,9,36,36,144,2,9,36, 36,16,0,144,36,20,114,144,36,16,1,11,16,0,20,26,15,53,9,2,1, diff --git a/racket/src/racket/src/file.c b/racket/src/racket/src/file.c index 15f511e0b6..0541a5844d 100644 --- a/racket/src/racket/src/file.c +++ b/racket/src/racket/src/file.c @@ -219,6 +219,7 @@ static Scheme_Object *find_system_path(int argc, Scheme_Object **argv); static Scheme_Object *current_directory(int argc, Scheme_Object *argv[]); static Scheme_Object *current_user_directory(int argc, Scheme_Object *argv[]); #endif +static Scheme_Object *current_force_delete_perms(int argc, Scheme_Object *argv[]); static int has_null(const char *s, intptr_t l); static void raise_null_error(const char *name, Scheme_Object *path, const char *mod); @@ -564,6 +565,11 @@ void scheme_init_file(Scheme_Env *env) MZCONFIG_CURRENT_USER_DIRECTORY), env); #endif + scheme_add_global_constant("current-force-delete-permissions", + scheme_register_parameter(current_force_delete_perms, + "current-force-delete-permissions", + MZCONFIG_FORCE_DELETE_PERMS), + env); #ifndef NO_FILE_SYSTEM_UTILS scheme_add_global_constant("current-library-collection-paths", @@ -4126,28 +4132,60 @@ static char *filename_for_error(Scheme_Object *p) 0); } +#ifdef DOS_FILE_SYSTEM +static int enable_write_permission(char *fn) +{ + int len; + int flags; + + if (SCHEME_FALSEP(scheme_get_param(scheme_current_config(), MZCONFIG_FORCE_DELETE_PERMS))) + return 0; + + len = strlen(fn); + return UNC_stat(fn, len, &flags, NULL, NULL, NULL, NULL, NULL, MZ_UNC_WRITE); +} +#endif + static Scheme_Object *delete_file(int argc, Scheme_Object **argv) { int errid; + const char *fn; if (!SCHEME_PATH_STRINGP(argv[0])) scheme_wrong_contract("delete-file", "path-string?", 0, argc, argv); + fn = scheme_expand_string_filename(argv[0], + "delete-file", + NULL, + SCHEME_GUARD_FILE_DELETE); + +#ifdef DOS_FILE_SYSTEM + if (DeleteFileW(MSC_WIDE_PATH(fn))) + return scheme_void; + errid = GetLastError(); + if (errid == ERROR_ACCESS_DENIED) { + /* Maybe it's just that the file has no write permission. Provide a more + Unix-like experience by attempting to change the file's permission. */ + if (enable_write_permission(fn)) { + if (DeleteFileW(MSC_WIDE_PATH(fn))) + return scheme_void; + errid = GetLastError(); + } + } +#else while (1) { - if (!MSC_W_IZE(unlink)(MSC_WIDE_PATH(scheme_expand_string_filename(argv[0], - "delete-file", - NULL, - SCHEME_GUARD_FILE_DELETE)))) + if (!MSC_W_IZE(unlink)(MSC_WIDE_PATH(fn))) return scheme_void; else if (errno != EINTR) break; } errid = errno; - +#endif + scheme_raise_exn(MZEXN_FAIL_FILESYSTEM, "delete-file: cannot delete file\n" " path: %q\n" - " system error: %e", + " system error: %E", filename_for_error(argv[0]), errid); @@ -5692,7 +5730,7 @@ static Scheme_Object *delete_directory(int argc, Scheme_Object *argv[]) return scheme_false; #else # ifdef DOS_FILE_SYSTEM - int tried_cwd = 0; + int tried_cwd = 0, tried_perm = 0; # endif char *filename; @@ -5714,6 +5752,10 @@ static Scheme_Object *delete_directory(int argc, Scheme_Object *argv[]) tcd = scheme_get_param(scheme_current_config(), MZCONFIG_CURRENT_DIRECTORY); scheme_os_setcwd(SCHEME_PATH_VAL(tcd), 0); tried_cwd = 1; + } else if ((errno == EACCES) && !tried_perm) { + /* Maybe the directory doesn't have write permission. */ + (void)enable_write_permission(filename); + tried_perm = 1; } # endif else if (errno != EINTR) @@ -6262,6 +6304,13 @@ static Scheme_Object *current_user_directory(int argc, Scheme_Object **argv) #endif +static Scheme_Object *current_force_delete_perms(int argc, Scheme_Object *argv[]) +{ + return scheme_param_config("current-force-delete-permissions", + scheme_make_integer(MZCONFIG_FORCE_DELETE_PERMS), + argc, argv, -1, NULL, NULL, 1); +} + static Scheme_Object *check_link_key_val(Scheme_Object *key, Scheme_Object *val) { Scheme_Object *new_val = scheme_null, *a; diff --git a/racket/src/racket/src/schminc.h b/racket/src/racket/src/schminc.h index bbfbfd946a..49b4e56978 100644 --- a/racket/src/racket/src/schminc.h +++ b/racket/src/racket/src/schminc.h @@ -14,7 +14,7 @@ #define USE_COMPILED_STARTUP 1 -#define EXPECTED_PRIM_COUNT 1129 +#define EXPECTED_PRIM_COUNT 1130 #define EXPECTED_UNSAFE_COUNT 106 #define EXPECTED_FLFXNUM_COUNT 69 #define EXPECTED_EXTFL_COUNT 45 diff --git a/racket/src/racket/src/schvers.h b/racket/src/racket/src/schvers.h index 34f470bf3f..7f6576b06e 100644 --- a/racket/src/racket/src/schvers.h +++ b/racket/src/racket/src/schvers.h @@ -13,12 +13,12 @@ consistently.) */ -#define MZSCHEME_VERSION "6.1.1.6" +#define MZSCHEME_VERSION "6.1.1.7" #define MZSCHEME_VERSION_X 6 #define MZSCHEME_VERSION_Y 1 #define MZSCHEME_VERSION_Z 1 -#define MZSCHEME_VERSION_W 6 +#define MZSCHEME_VERSION_W 7 #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y) #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W) diff --git a/racket/src/racket/src/thread.c b/racket/src/racket/src/thread.c index d79964c6b0..6e295228f4 100644 --- a/racket/src/racket/src/thread.c +++ b/racket/src/racket/src/thread.c @@ -7925,6 +7925,8 @@ static void make_initial_config(Scheme_Thread *p) init_param(cells, paramz, MZCONFIG_CURRENT_ENV_VARS, ev); } + init_param(cells, paramz, MZCONFIG_FORCE_DELETE_PERMS, scheme_true); + { Scheme_Object *rs; rs = scheme_make_random_state(scheme_get_milliseconds());