From 3c615e434b9ca5b0c01615498f09723084e00b0a Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 24 Apr 2012 16:12:00 -0600 Subject: [PATCH] fix resolution of relative module path in a submodule Closes PR 12729 --- collects/tests/racket/for-submod.rkt | 4 + collects/tests/racket/has-submod.rkt | 6 + collects/tests/racket/submodule.rktl | 8 + src/racket/src/cstartup.inc | 669 ++++++++++++++------------- src/racket/src/startup.inc | 3 +- src/racket/src/startup.rktl | 11 +- 6 files changed, 361 insertions(+), 340 deletions(-) create mode 100644 collects/tests/racket/for-submod.rkt create mode 100644 collects/tests/racket/has-submod.rkt diff --git a/collects/tests/racket/for-submod.rkt b/collects/tests/racket/for-submod.rkt new file mode 100644 index 0000000000..e80526f6c6 --- /dev/null +++ b/collects/tests/racket/for-submod.rkt @@ -0,0 +1,4 @@ +#lang racket/base +(provide for-submod) + +(define for-submod 'for-submod) diff --git a/collects/tests/racket/has-submod.rkt b/collects/tests/racket/has-submod.rkt new file mode 100644 index 0000000000..305dfaccdf --- /dev/null +++ b/collects/tests/racket/has-submod.rkt @@ -0,0 +1,6 @@ +#lang racket/base + +(module+ main + (require "for-submod.rkt") + (provide has-submod) + (define has-submod for-submod)) diff --git a/collects/tests/racket/submodule.rktl b/collects/tests/racket/submodule.rktl index cd801b999f..0eb921b261 100644 --- a/collects/tests/racket/submodule.rktl +++ b/collects/tests/racket/submodule.rktl @@ -484,6 +484,14 @@ (test 10 dynamic-require '(submod 'subm-all-defined-1 main) 'x) +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Check submodule resolution of relative paths: + +(parameterize ([current-load-relative-directory (find-system-path 'temp-dir)]) + (define p (collection-file-path "has-submod.rkt" "tests" "racket")) + (dynamic-require p #f) + (test 'for-submod dynamic-require `(submod ,p main) 'has-submod)) + ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (report-errs) diff --git a/src/racket/src/cstartup.inc b/src/racket/src/cstartup.inc index 367ce7177f..29f26e900c 100644 --- a/src/racket/src/cstartup.inc +++ b/src/racket/src/cstartup.inc @@ -15,13 +15,13 @@ 115,116,120,61,115,70,108,101,116,45,118,97,108,117,101,115,61,120,73,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,248,81, +73,100,101,102,105,110,101,45,118,97,108,117,101,115,97,36,11,8,240,249,81, 0,0,95,159,2,17,36,36,159,2,16,36,36,159,2,16,36,36,16,20,2, 3,2,2,2,4,2,2,2,5,2,2,2,6,2,2,2,10,2,2,2,7, 2,2,2,8,2,2,2,9,2,2,2,11,2,2,2,12,2,2,97,37,11, -8,240,248,81,0,0,93,159,2,16,36,37,16,2,2,13,161,2,2,37,2, -13,2,2,2,13,96,38,11,8,240,248,81,0,0,16,0,96,11,11,8,240, -248,81,0,0,16,0,18,98,64,104,101,114,101,13,16,5,36,2,14,2,2, +8,240,249,81,0,0,93,159,2,16,36,37,16,2,2,13,161,2,2,37,2, +13,2,2,2,13,96,38,11,8,240,249,81,0,0,16,0,96,11,11,8,240, +249,81,0,0,16,0,18,98,64,104,101,114,101,13,16,5,36,2,14,2,2, 11,11,8,32,8,31,8,30,8,29,27,248,22,156,4,195,249,22,149,4,80, 158,39,36,251,22,83,2,18,248,22,98,199,12,249,22,73,2,19,248,22,100, 201,27,248,22,156,4,195,249,22,149,4,80,158,39,36,251,22,83,2,18,248, @@ -30,14 +30,14 @@ 22,74,193,249,22,149,4,80,158,39,36,251,22,83,2,18,248,22,74,199,249, 22,73,2,4,248,22,75,201,11,18,100,10,13,16,5,36,2,14,2,2,11, 11,8,32,8,31,8,30,8,29,16,4,11,11,2,20,3,1,8,101,110,118, -49,53,53,52,50,16,4,11,11,2,21,3,1,8,101,110,118,49,53,53,52, -51,27,248,22,75,248,22,156,4,196,28,248,22,81,193,20,14,159,37,36,37, +49,53,53,52,52,16,4,11,11,2,21,3,1,8,101,110,118,49,53,53,52, +53,27,248,22,75,248,22,156,4,196,28,248,22,81,193,20,14,159,37,36,37, 28,248,22,81,248,22,75,194,248,22,74,193,249,22,149,4,80,158,39,36,250, 22,83,2,22,248,22,83,249,22,83,248,22,83,2,23,248,22,74,201,251,22, 83,2,18,2,23,2,23,249,22,73,2,11,248,22,75,204,18,100,11,13,16, 5,36,2,14,2,2,11,11,8,32,8,31,8,30,8,29,16,4,11,11,2, -20,3,1,8,101,110,118,49,53,53,52,53,16,4,11,11,2,21,3,1,8, -101,110,118,49,53,53,52,54,248,22,156,4,193,27,248,22,156,4,194,249,22, +20,3,1,8,101,110,118,49,53,53,52,55,16,4,11,11,2,21,3,1,8, +101,110,118,49,53,53,52,56,248,22,156,4,193,27,248,22,156,4,194,249,22, 73,248,22,83,248,22,74,196,248,22,75,195,27,248,22,75,248,22,156,4,23, 197,1,249,22,149,4,80,158,39,36,28,248,22,58,248,22,150,4,248,22,74, 23,198,2,27,249,22,2,32,0,88,163,8,36,37,43,11,9,222,33,40,248, @@ -67,8 +67,8 @@ 22,142,9,248,22,150,4,248,22,74,200,64,101,108,115,101,10,248,22,74,197, 250,22,84,2,22,9,248,22,75,200,249,22,73,2,7,248,22,75,202,99,13, 16,5,36,2,14,2,2,11,11,8,32,8,31,8,30,8,29,16,4,11,11, -2,20,3,1,8,101,110,118,49,53,53,54,56,16,4,11,11,2,21,3,1, -8,101,110,118,49,53,53,54,57,18,158,94,10,64,118,111,105,100,8,48,27, +2,20,3,1,8,101,110,118,49,53,53,55,48,16,4,11,11,2,21,3,1, +8,101,110,118,49,53,53,55,49,18,158,94,10,64,118,111,105,100,8,48,27, 248,22,75,248,22,156,4,196,249,22,149,4,80,158,39,36,28,248,22,58,248, 22,150,4,248,22,74,197,250,22,83,2,28,248,22,83,248,22,74,199,248,22, 98,198,27,248,22,150,4,248,22,74,197,250,22,83,2,28,248,22,83,248,22, @@ -632,11 +632,11 @@ 45,0,51,0,64,0,73,0,80,0,102,0,124,0,150,0,158,0,170,0,185, 0,201,0,219,0,239,0,251,0,11,1,34,1,46,1,77,1,84,1,89,1, 94,1,100,1,104,1,122,1,127,1,132,1,141,1,146,1,153,1,158,1,162, -1,167,1,174,1,185,1,192,1,195,1,203,1,212,1,220,1,21,2,124,2, -206,2,227,2,248,2,22,3,52,3,110,3,168,3,217,3,10,4,114,10,165, -10,228,10,247,10,5,11,163,11,176,11,54,12,96,13,219,13,225,13,253,13, -10,14,172,14,179,14,233,14,255,14,19,15,74,15,84,15,171,15,173,15,20, -16,3,24,56,24,80,24,104,24,0,0,31,28,0,0,66,35,37,98,111,111, +1,167,1,174,1,185,1,192,1,195,1,203,1,212,1,220,1,21,2,141,2, +223,2,244,2,9,3,39,3,69,3,127,3,185,3,234,3,27,4,131,10,182, +10,245,10,8,11,22,11,180,11,193,11,71,12,113,13,236,13,242,13,14,14, +27,14,189,14,196,14,250,14,16,15,36,15,91,15,101,15,188,15,190,15,37, +16,20,24,73,24,97,24,121,24,0,0,48,28,0,0,66,35,37,98,111,111, 116,70,100,108,108,45,115,117,102,102,105,120,1,25,100,101,102,97,117,108,116, 45,108,111,97,100,47,117,115,101,45,99,111,109,112,105,108,101,100,65,113,117, 111,116,101,29,94,2,4,67,35,37,117,116,105,108,115,11,68,35,37,112,97, @@ -663,324 +663,325 @@ 197,86,95,23,195,1,23,193,1,28,249,22,147,15,0,11,35,114,120,34,91, 46,93,115,115,36,34,248,22,164,14,23,197,1,249,80,159,41,56,39,198,2, 25,196,27,28,23,195,2,28,249,22,142,9,23,197,2,80,158,39,50,86,94, -23,195,1,80,158,37,51,27,248,22,140,5,23,197,2,28,248,22,159,14,23, -194,2,90,159,39,11,89,161,39,36,11,248,22,180,14,23,197,1,86,95,20, -18,159,11,80,158,41,50,198,20,18,159,11,80,158,41,51,192,192,11,11,28, -23,193,2,192,86,94,23,193,1,27,247,22,164,5,28,192,192,247,22,136,15, -28,24,194,2,12,20,13,159,80,159,36,55,37,80,158,36,53,89,161,37,37, -10,249,22,183,4,21,94,2,26,6,19,19,112,108,97,110,101,116,47,114,101, -115,111,108,118,101,114,46,114,107,116,1,27,112,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,250,22, -177,14,23,197,1,23,199,1,249,80,159,43,39,39,23,198,1,2,29,250,22, -177,14,23,197,1,23,199,1,249,80,159,43,39,39,23,198,1,2,29,252,22, -177,14,23,199,1,23,201,1,2,30,247,22,155,8,249,80,159,45,39,39,23, -200,1,80,159,45,36,38,252,22,177,14,23,199,1,23,201,1,2,30,247,22, -155,8,249,80,159,45,39,39,23,200,1,80,159,45,36,38,27,252,22,177,14, -23,200,1,23,202,1,2,30,247,22,155,8,249,80,159,46,39,39,23,201,1, -80,159,46,36,38,27,250,22,130,15,196,11,32,0,88,163,8,36,36,41,11, -9,222,11,28,192,249,22,73,195,194,11,27,252,22,177,14,23,200,1,23,202, -1,2,30,247,22,155,8,249,80,159,46,39,39,23,201,1,80,159,46,36,38, -27,250,22,130,15,196,11,32,0,88,163,8,36,36,41,11,9,222,11,28,192, -249,22,73,195,194,11,27,250,22,177,14,23,198,1,23,200,1,249,80,159,44, -39,39,23,199,1,2,29,27,250,22,130,15,196,11,32,0,88,163,8,36,36, -41,11,9,222,11,28,192,249,22,73,195,194,11,27,250,22,177,14,23,198,1, -23,200,1,249,80,159,44,39,39,23,199,1,2,29,27,250,22,130,15,196,11, -32,0,88,163,8,36,36,41,11,9,222,11,28,192,249,22,73,195,194,11,86, -95,28,248,80,159,37,38,39,23,195,2,12,250,22,178,9,2,27,6,25,25, -112,97,116,104,32,111,114,32,118,97,108,105,100,45,112,97,116,104,32,115,116, -114,105,110,103,23,197,2,28,28,23,195,2,28,248,22,58,23,196,2,10,28, -248,22,82,23,196,2,28,249,22,186,3,248,22,86,23,198,2,37,28,28,248, -22,58,248,22,74,23,197,2,10,248,22,140,9,248,22,74,23,197,2,249,22, -4,22,58,248,22,75,23,198,2,11,11,11,10,12,250,22,178,9,2,27,6, -71,71,35,102,44,32,115,121,109,98,111,108,44,32,108,105,115,116,32,40,108, -101,110,103,116,104,32,50,32,111,114,32,109,111,114,101,41,32,111,102,32,115, -121,109,98,111,108,32,111,114,32,35,102,32,102,111,108,108,111,119,101,100,32, -98,121,32,115,121,109,98,111,108,115,23,197,2,90,159,46,11,89,161,37,36, -11,28,248,22,183,14,23,205,2,23,204,2,27,247,22,164,5,28,23,193,2, -249,22,184,14,23,207,2,23,195,1,23,205,2,89,161,39,37,11,248,22,180, -14,23,205,1,86,94,23,196,1,89,161,38,40,11,28,23,205,2,27,248,22, -164,14,23,197,2,27,248,22,190,7,23,195,2,28,28,249,22,188,3,23,195, -2,40,249,22,129,8,2,25,249,22,132,8,23,198,2,249,22,176,3,23,199, -2,40,11,249,22,7,23,199,2,248,22,168,14,249,22,133,8,250,22,132,8, -23,202,1,36,249,22,176,3,23,203,1,40,5,3,46,115,115,249,22,7,23, -199,2,11,249,22,7,23,197,2,11,89,161,37,42,11,28,249,22,142,9,23, -199,2,23,197,2,23,193,2,249,22,177,14,23,196,2,23,199,2,89,161,37, -43,11,28,23,198,2,28,249,22,142,9,23,200,2,23,197,1,23,193,1,86, -94,23,193,1,249,22,177,14,23,196,2,23,200,2,86,94,23,195,1,11,89, -161,37,44,11,28,249,22,142,9,23,196,2,68,114,101,108,97,116,105,118,101, -86,94,23,194,1,2,28,23,194,1,89,161,37,45,11,247,22,138,15,27,250, -22,130,15,23,203,2,11,32,0,88,163,8,36,36,41,11,9,222,11,27,28, -23,194,2,249,22,73,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,130,15,23,207,2,11,32,0,88,163,8, -36,36,41,11,9,222,11,28,192,249,22,73,23,206,2,194,11,11,27,28,23, -195,2,23,195,2,23,194,2,27,88,163,36,37,50,44,62,122,111,225,15,13, -9,33,46,27,88,163,36,37,50,44,66,97,108,116,45,122,111,225,16,14,11, -33,47,27,88,163,36,37,52,45,9,225,17,15,11,33,48,27,88,163,36,37, -52,45,9,225,18,16,13,33,49,27,28,23,200,2,23,200,2,248,22,140,9, -23,200,2,27,28,23,208,2,28,23,200,2,86,94,23,201,1,23,200,2,248, -22,140,9,23,202,1,11,27,28,23,195,2,28,23,197,1,27,249,22,5,88, -163,8,36,37,53,45,9,225,24,22,18,33,50,23,216,2,27,28,23,202,2, -11,193,28,192,192,28,193,28,23,202,2,28,249,22,188,3,248,22,75,196,248, -22,75,23,205,2,193,11,11,11,11,86,94,23,197,1,11,28,23,193,2,86, -105,23,213,1,23,211,1,23,210,1,23,209,1,23,208,1,23,201,1,23,200, -1,23,199,1,23,198,1,23,196,1,23,195,1,23,194,1,20,13,159,80,159, -57,40,37,250,80,159,8,24,41,37,249,22,27,11,80,159,8,26,40,37,22, -182,4,11,20,13,159,80,159,57,40,37,250,80,159,8,24,41,37,249,22,27, -11,80,159,8,26,40,37,22,164,5,28,248,22,159,14,23,216,2,23,215,1, -86,94,23,215,1,247,22,136,15,249,247,22,142,15,248,22,74,195,23,25,86, -94,23,193,1,27,28,23,195,2,28,23,197,1,27,249,22,5,88,163,8,36, -37,53,45,9,225,25,23,20,33,51,23,217,2,27,28,23,204,2,11,193,28, -192,192,28,193,28,203,28,249,22,188,3,248,22,75,196,248,22,75,206,193,11, -11,11,11,86,94,23,197,1,11,28,23,193,2,86,102,23,214,1,23,211,1, -23,210,1,23,209,1,23,201,1,23,200,1,23,199,1,23,196,1,23,195,1, -20,13,159,80,159,58,40,37,250,80,159,8,25,41,37,249,22,27,11,80,159, -8,27,40,37,22,182,4,23,215,1,20,13,159,80,159,58,40,37,250,80,159, -8,25,41,37,249,22,27,11,80,159,8,27,40,37,22,164,5,28,248,22,159, -14,23,217,2,23,216,1,86,94,23,216,1,247,22,136,15,249,247,22,142,15, -248,22,74,195,23,26,86,94,23,193,1,27,28,23,197,2,28,23,201,1,27, -249,22,5,20,20,94,88,163,8,36,37,51,44,9,225,26,24,20,33,52,23, -213,1,23,218,2,27,28,23,204,2,11,193,28,192,192,28,193,28,23,204,2, -28,249,22,188,3,248,22,75,196,248,22,75,23,207,2,193,11,11,11,86,94, -23,210,1,11,86,94,23,201,1,11,28,23,193,2,86,101,23,215,1,23,213, -1,23,212,1,23,211,1,23,202,1,23,200,1,23,197,1,23,196,1,20,13, -159,80,159,59,40,37,250,80,159,8,26,41,37,249,22,27,11,80,159,8,28, -40,37,22,182,4,11,20,13,159,80,159,59,40,37,250,80,159,8,26,41,37, -249,22,27,11,80,159,8,28,40,37,22,164,5,28,248,22,159,14,23,218,2, -23,217,1,86,94,23,217,1,247,22,136,15,249,247,22,162,5,248,22,74,195, -23,27,86,94,23,193,1,27,28,23,197,1,28,23,201,1,27,249,22,5,20, -20,94,88,163,8,36,37,51,44,9,225,27,25,22,33,53,23,215,1,23,219, -1,27,28,23,205,2,11,193,28,192,192,28,193,28,204,28,249,22,188,3,248, -22,75,196,248,22,75,23,15,193,11,11,11,86,95,23,216,1,23,212,1,11, -86,94,23,201,1,11,28,23,193,2,86,95,23,213,1,23,198,1,20,13,159, -80,159,8,24,40,37,250,80,159,8,27,41,37,249,22,27,11,80,159,8,29, -40,37,22,182,4,23,217,1,20,13,159,80,159,8,24,40,37,250,80,159,8, -27,41,37,249,22,27,11,80,159,8,29,40,37,22,164,5,28,248,22,159,14, -23,219,2,23,218,1,86,94,23,218,1,247,22,136,15,249,247,22,162,5,248, -22,74,195,23,28,86,94,23,193,1,28,28,248,22,71,23,220,2,248,22,74, -23,220,2,10,27,28,23,199,2,86,94,23,215,1,23,214,1,86,94,23,214, -1,23,215,1,28,28,248,22,71,23,221,2,248,22,140,9,248,22,171,14,23, -195,2,11,12,20,13,159,80,159,8,25,40,37,250,80,159,8,28,41,37,249, -22,27,11,80,159,8,30,40,37,22,182,4,28,23,30,28,23,202,1,11,195, -86,94,23,202,1,11,20,13,159,80,159,8,25,40,37,250,80,159,8,28,41, -37,249,22,27,11,80,159,8,30,40,37,22,164,5,28,248,22,159,14,23,220, -2,23,219,1,86,94,23,219,1,247,22,136,15,249,247,22,162,5,194,23,29, -12,27,249,22,162,8,80,159,39,45,38,249,22,183,3,248,22,179,3,248,22, -166,2,200,8,128,8,27,28,193,248,22,169,2,194,11,28,192,27,249,22,96, -198,195,28,192,248,22,75,193,11,11,27,249,22,183,3,248,22,179,3,248,22, -166,2,198,8,128,8,27,249,22,162,8,80,159,40,45,38,195,27,28,193,248, -22,169,2,194,11,250,22,163,8,80,159,42,45,38,197,248,22,168,2,249,22, -73,249,22,73,204,205,28,198,198,9,0,17,35,114,120,34,94,40,46,42,63, -41,47,40,46,42,41,36,34,32,58,88,163,8,36,37,59,11,2,31,222,33, -59,27,249,22,147,15,2,57,23,196,2,28,23,193,2,86,94,23,194,1,249, -22,73,248,22,98,23,196,2,27,248,22,107,23,197,1,27,249,22,147,15,2, -57,23,196,2,28,23,193,2,86,94,23,194,1,249,22,73,248,22,98,23,196, -2,27,248,22,107,23,197,1,27,249,22,147,15,2,57,23,196,2,28,23,193, -2,86,94,23,194,1,249,22,73,248,22,98,23,196,2,27,248,22,107,23,197, -1,27,249,22,147,15,2,57,23,196,2,28,23,193,2,86,94,23,194,1,249, -22,73,248,22,98,23,196,2,248,2,58,248,22,107,23,197,1,248,22,83,194, -248,22,83,194,248,22,83,194,248,22,83,194,32,60,88,163,36,37,55,11,2, -31,222,33,61,28,248,22,81,248,22,75,23,195,2,249,22,7,9,248,22,74, -195,90,159,38,11,89,161,38,36,11,27,248,22,75,196,28,248,22,81,248,22, -75,23,195,2,249,22,7,9,248,22,74,195,90,159,38,11,89,161,38,36,11, -27,248,22,75,196,28,248,22,81,248,22,75,23,195,2,249,22,7,9,248,22, -74,195,90,159,38,11,89,161,38,36,11,248,2,60,248,22,75,196,249,22,7, -249,22,73,248,22,74,199,196,195,249,22,7,249,22,73,248,22,74,199,196,195, -249,22,7,249,22,73,248,22,74,199,196,195,27,27,249,22,147,15,2,57,23, -197,2,28,23,193,2,86,94,23,195,1,249,22,73,248,22,98,23,196,2,27, -248,22,107,23,197,1,27,249,22,147,15,2,57,23,196,2,28,23,193,2,86, -94,23,194,1,249,22,73,248,22,98,23,196,2,27,248,22,107,23,197,1,27, -249,22,147,15,2,57,23,196,2,28,23,193,2,86,94,23,194,1,249,22,73, -248,22,98,23,196,2,27,248,22,107,23,197,1,27,249,22,147,15,2,57,23, -196,2,28,23,193,2,86,94,23,194,1,249,22,73,248,22,98,23,196,2,248, -2,58,248,22,107,23,197,1,248,22,83,194,248,22,83,194,248,22,83,194,248, -22,83,195,28,23,195,1,192,28,248,22,81,248,22,75,23,195,2,249,22,7, -9,248,22,74,195,27,248,22,75,194,90,159,38,11,89,161,38,36,11,28,248, -22,81,248,22,75,23,197,2,249,22,7,9,248,22,74,197,27,248,22,75,196, -90,159,38,11,89,161,38,36,11,28,248,22,81,248,22,75,23,197,2,249,22, -7,9,248,22,74,197,90,159,38,11,89,161,38,36,11,248,2,60,248,22,75, -198,249,22,7,249,22,73,248,22,74,201,196,195,249,22,7,249,22,73,248,22, -74,202,196,195,249,22,7,249,22,73,248,22,74,200,196,195,86,95,28,248,22, -138,5,195,12,250,22,178,9,2,21,6,20,20,114,101,115,111,108,118,101,100, -45,109,111,100,117,108,101,45,112,97,116,104,197,28,24,193,2,248,24,194,1, -195,86,94,23,193,1,12,27,250,22,153,2,80,159,41,43,38,248,22,172,15, -247,22,137,13,11,27,28,23,194,2,193,86,94,23,194,1,27,247,22,133,2, -86,94,250,22,151,2,80,159,43,43,38,248,22,172,15,247,22,137,13,195,192, -250,22,151,2,195,199,66,97,116,116,97,99,104,251,211,197,198,199,10,32,65, -88,163,36,38,47,11,76,102,108,97,116,116,101,110,45,115,117,98,45,112,97, -116,104,222,33,68,32,66,88,163,36,40,54,11,2,31,222,33,67,28,248,22, -81,23,197,2,28,248,22,81,195,192,249,22,73,194,248,22,88,197,28,249,22, -144,9,248,22,74,23,199,2,2,33,28,248,22,81,23,196,2,86,95,23,196, -1,23,195,1,250,22,175,9,2,21,6,37,37,116,111,111,32,109,97,110,121, -32,34,46,46,34,115,32,105,110,32,115,117,98,109,111,100,117,108,101,32,112, -97,116,104,58,32,126,46,115,250,22,84,2,32,28,249,22,144,9,23,201,2, -2,34,198,28,248,22,159,14,199,198,249,22,83,28,248,22,58,201,2,4,2, -35,200,199,251,2,66,196,197,248,22,75,199,248,22,75,200,251,2,66,196,197, -249,22,73,248,22,74,202,200,248,22,75,200,251,2,66,196,197,9,197,27,249, -22,155,7,6,31,31,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,58,32,196,28,193,250,22, -177,9,11,195,196,248,22,175,9,193,28,249,22,138,7,194,2,34,2,28,28, -249,22,138,7,194,2,33,62,117,112,192,32,71,88,163,8,36,37,50,11,67, -115,115,45,62,114,107,116,222,33,72,27,248,22,135,7,194,28,249,22,188,3, -194,39,28,249,22,138,7,6,3,3,46,115,115,249,22,154,7,197,249,22,176, -3,198,39,249,22,155,7,250,22,154,7,198,36,249,22,176,3,199,39,2,38, -193,193,0,8,35,114,120,34,91,46,93,34,28,249,22,144,9,248,22,75,23, -200,2,23,197,1,28,249,22,142,9,248,22,74,23,200,2,23,196,1,251,22, -175,9,2,21,6,28,28,99,121,99,108,101,32,105,110,32,108,111,97,100,105, -110,103,32,97,116,32,126,46,115,58,32,126,46,115,23,200,1,249,22,2,22, -75,248,22,88,249,22,73,23,206,1,23,202,1,12,12,247,192,20,13,159,80, -159,43,48,38,249,22,73,249,22,73,248,22,172,15,247,22,137,13,23,201,1, -23,195,1,20,13,159,80,159,43,40,37,250,80,159,46,41,37,249,22,27,11, -80,159,48,40,37,22,181,4,23,198,2,249,247,22,163,5,23,200,1,27,248, -22,61,248,22,163,14,23,201,1,28,23,202,2,28,250,22,153,2,23,200,1, -23,201,1,11,249,22,73,11,203,249,22,73,194,203,192,86,94,28,28,248,22, -159,14,23,196,2,10,248,22,148,5,23,196,2,12,28,23,197,2,250,22,177, -9,11,6,15,15,98,97,100,32,109,111,100,117,108,101,32,112,97,116,104,23, -200,2,250,22,178,9,2,21,6,19,19,109,111,100,117,108,101,45,112,97,116, -104,32,111,114,32,112,97,116,104,23,198,2,28,28,248,22,71,23,196,2,249, -22,142,9,248,22,74,23,198,2,2,4,11,248,22,139,5,248,22,98,196,28, -28,248,22,71,23,196,2,28,249,22,142,9,248,22,74,23,198,2,2,32,28, -248,22,71,248,22,98,23,197,2,249,22,142,9,248,22,102,23,198,2,2,4, -11,11,11,86,97,23,198,1,23,197,1,23,196,1,23,193,1,248,22,139,5, -249,2,65,248,22,115,23,199,2,248,22,100,23,199,1,28,28,248,22,71,23, -196,2,28,249,22,142,9,248,22,74,23,198,2,2,32,28,28,249,22,144,9, -248,22,98,23,198,2,2,34,10,249,22,144,9,248,22,98,23,198,2,2,33, -28,23,196,2,27,248,22,140,5,23,198,2,28,248,22,58,193,10,28,248,22, -71,193,248,22,58,248,22,74,194,11,11,11,11,11,86,96,23,198,1,23,197, -1,23,193,1,27,248,22,140,5,23,198,1,248,22,139,5,249,2,65,28,248, -22,71,23,197,2,248,22,74,23,197,2,23,196,2,27,28,249,22,144,9,248, -22,98,23,203,2,2,33,248,22,75,200,248,22,100,200,28,248,22,71,23,198, -2,249,22,87,248,22,75,199,194,192,28,28,248,22,71,23,196,2,249,22,142, -9,248,22,74,23,198,2,2,36,11,86,94,248,80,159,38,8,26,39,193,253, -213,200,201,202,203,11,80,158,43,53,28,28,248,22,71,23,196,2,28,249,22, -142,9,248,22,74,23,198,2,2,32,28,248,22,71,248,22,98,23,197,2,249, -22,142,9,248,22,102,23,198,2,2,36,11,11,11,86,94,248,80,159,38,8, -26,39,193,253,213,248,22,98,201,201,202,203,248,22,100,201,80,158,43,53,86, -94,23,193,1,27,88,163,8,36,37,47,11,79,115,104,111,119,45,99,111,108, -108,101,99,116,105,111,110,45,101,114,114,223,5,33,69,27,28,248,22,71,23, -198,2,28,249,22,142,9,2,32,248,22,74,23,200,2,27,248,22,98,23,199, -2,28,28,249,22,144,9,23,195,2,2,34,10,249,22,144,9,23,195,2,2, -33,86,94,23,193,1,28,23,199,2,27,248,22,140,5,23,201,2,28,248,22, -71,193,248,22,74,193,192,250,22,175,9,2,21,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,71,23,199,2,28,249,22,142,9, -2,32,248,22,74,23,201,2,27,28,28,28,249,22,144,9,248,22,98,23,202, -2,2,34,10,249,22,144,9,248,22,98,23,202,2,2,33,23,200,2,11,27, -248,22,140,5,23,202,2,27,28,249,22,144,9,248,22,98,23,204,2,2,33, -248,22,75,23,202,1,248,22,100,23,202,1,28,248,22,71,23,195,2,249,2, -65,248,22,74,23,197,2,249,22,87,248,22,75,23,199,1,23,197,1,249,2, -65,23,196,1,23,195,1,249,2,65,2,34,28,249,22,144,9,248,22,98,23, -204,2,2,33,248,22,75,23,202,1,248,22,100,23,202,1,28,248,22,71,193, -248,22,75,193,11,11,11,27,28,248,22,58,23,196,2,27,248,80,159,43,46, -39,249,22,73,23,199,2,247,22,137,15,28,23,193,2,192,86,94,23,193,1, -90,159,38,11,89,161,38,36,11,249,80,159,46,52,39,248,22,64,23,201,2, -11,27,28,248,22,81,23,195,2,2,37,249,22,155,7,23,197,2,2,38,251, -80,159,49,57,39,23,204,1,28,248,22,81,23,199,2,23,199,1,86,94,23, -199,1,248,22,74,23,199,2,28,248,22,81,23,199,2,86,94,23,198,1,9, -248,22,75,23,199,1,23,197,1,28,248,22,132,7,23,196,2,86,94,23,196, -1,27,248,80,159,43,8,27,39,23,202,2,27,248,80,159,44,46,39,249,22, -73,23,200,2,23,197,2,28,23,193,2,192,86,94,23,193,1,90,159,38,11, -89,161,38,36,11,249,80,159,47,52,39,23,201,2,11,250,22,1,22,177,14, -23,199,1,249,22,87,249,22,2,32,0,88,163,8,36,37,44,11,9,222,33, -70,23,200,1,248,22,83,248,2,71,23,201,1,28,248,22,159,14,23,196,2, -86,94,23,196,1,248,80,159,42,8,28,39,248,22,186,14,28,248,22,183,14, -23,198,2,23,197,2,249,22,184,14,23,199,2,248,80,159,46,8,27,39,23, -205,2,28,249,22,142,9,248,22,74,23,198,2,2,26,27,248,80,159,43,46, -39,249,22,73,23,199,2,247,22,137,15,28,23,193,2,192,86,94,23,193,1, -90,159,39,11,89,161,38,36,11,249,80,159,47,52,39,248,22,98,23,202,2, -11,89,161,37,38,11,28,248,22,81,248,22,100,23,201,2,28,248,22,81,23, -194,2,249,22,151,15,2,73,23,196,2,11,10,27,28,23,196,2,248,2,71, -23,196,2,28,248,22,81,23,195,2,2,37,28,249,22,151,15,2,73,23,197, -2,248,2,71,23,196,2,249,22,155,7,23,197,2,2,38,27,28,23,197,1, -86,94,23,196,1,249,22,87,28,248,22,81,248,22,100,23,205,2,21,93,6, -5,5,109,122,108,105,98,249,22,1,22,87,249,22,2,80,159,53,8,29,39, -248,22,100,23,208,2,23,197,1,28,248,22,81,23,196,2,86,94,23,195,1, -248,22,83,23,197,1,86,94,23,196,1,23,195,1,251,80,159,51,57,39,23, -206,1,248,22,74,23,198,2,248,22,75,23,198,1,23,198,1,28,249,22,142, -9,248,22,74,23,198,2,2,35,248,80,159,42,8,28,39,248,22,186,14,249, -22,184,14,248,22,188,14,248,22,98,23,201,2,248,80,159,46,8,27,39,23, -205,2,12,86,94,28,28,248,22,159,14,23,194,2,10,248,22,157,8,23,194, -2,86,94,23,201,1,12,28,23,201,2,250,22,177,9,67,114,101,113,117,105, -114,101,249,22,180,7,6,17,17,98,97,100,32,109,111,100,117,108,101,32,112, -97,116,104,126,97,28,23,198,2,248,22,74,23,199,2,2,39,23,204,1,86, -94,23,201,1,250,22,178,9,2,21,249,22,180,7,6,13,13,109,111,100,117, -108,101,32,112,97,116,104,126,97,28,23,198,2,248,22,74,23,199,2,2,39, -23,198,2,27,28,248,22,157,8,23,195,2,249,22,162,8,23,196,2,36,249, -22,186,14,248,22,187,14,23,197,2,11,27,28,248,22,157,8,23,196,2,249, -22,162,8,23,197,2,37,248,80,159,44,58,39,23,195,2,90,159,39,11,89, -161,39,36,11,28,248,22,157,8,23,199,2,250,22,7,2,40,249,22,162,8, -23,203,2,38,2,40,248,22,180,14,23,198,2,86,95,23,195,1,23,193,1, -27,28,248,22,157,8,23,200,2,249,22,162,8,23,201,2,39,249,80,159,49, -56,39,23,197,2,5,0,27,28,248,22,157,8,23,201,2,249,22,162,8,23, -202,2,40,248,22,139,5,23,200,2,27,250,22,153,2,80,159,52,43,38,248, -22,172,15,247,22,137,13,11,27,28,23,194,2,23,194,1,86,94,23,194,1, -27,247,22,133,2,86,94,250,22,151,2,80,159,54,43,38,248,22,172,15,247, -22,137,13,195,192,27,28,23,204,2,248,22,139,5,249,22,73,248,22,140,5, -23,200,2,23,207,2,23,196,2,86,95,28,23,212,1,27,250,22,153,2,23, -198,2,196,11,28,23,193,1,12,86,94,27,27,28,248,22,17,80,159,55,49, -38,80,159,54,49,38,247,22,19,251,22,27,11,80,159,58,48,38,9,23,197, -1,27,248,22,172,15,247,22,137,13,86,94,249,22,3,20,20,94,88,163,8, -36,37,55,11,9,226,14,13,2,3,33,74,23,195,1,23,196,2,248,28,248, -22,17,80,159,56,49,38,32,0,88,163,36,37,42,11,9,222,33,75,80,159, -55,8,30,39,20,20,95,88,163,36,36,55,8,176,64,9,230,19,15,13,12, -8,7,5,2,33,76,23,195,1,23,208,1,250,22,151,2,23,198,1,196,10, -12,28,28,248,22,157,8,23,204,1,11,28,248,22,132,7,23,206,2,10,28, -248,22,58,23,206,2,10,28,248,22,71,23,206,2,249,22,142,9,248,22,74, -23,208,2,2,26,11,249,80,159,53,47,39,28,248,22,132,7,23,208,2,249, -22,73,23,209,1,248,80,159,56,8,27,39,23,215,1,86,94,23,212,1,249, -22,73,23,209,1,247,22,137,15,252,22,159,8,23,209,1,23,208,1,23,206, -1,23,204,1,23,203,1,12,192,86,96,20,18,159,11,80,158,36,53,248,80, -159,37,8,25,37,249,22,27,11,80,159,39,55,37,248,22,180,4,80,159,37, -54,38,248,22,163,5,80,159,37,37,39,248,22,128,14,80,159,37,42,39,20, -18,159,11,80,158,36,53,248,80,159,37,8,25,37,249,22,27,11,80,159,39, -55,37,20,18,159,11,80,158,36,53,248,80,159,37,8,25,37,249,22,27,11, -80,159,39,55,37,159,36,20,113,159,36,16,1,11,16,0,20,26,144,9,2, -1,2,1,29,11,11,9,9,11,11,11,10,38,80,158,36,36,20,113,159,41, -16,26,2,2,2,3,30,2,5,72,112,97,116,104,45,115,116,114,105,110,103, -63,11,30,2,5,75,112,97,116,104,45,97,100,100,45,115,117,102,102,105,120, -8,30,2,7,2,8,6,30,2,7,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,3,2,9,2,10,2,11, -2,12,2,13,2,14,2,15,2,16,2,17,2,18,2,19,2,20,2,21,30, -2,22,2,8,6,30,2,5,79,112,97,116,104,45,114,101,112,108,97,99,101, -45,115,117,102,102,105,120,10,30,2,5,73,102,105,110,100,45,99,111,108,45, -102,105,108,101,3,30,2,5,76,110,111,114,109,97,108,45,99,97,115,101,45, -112,97,116,104,7,2,23,2,24,30,2,22,74,114,101,112,97,114,97,109,101, -116,101,114,105,122,101,7,16,0,37,39,36,16,0,36,16,14,2,15,2,16, -2,10,2,12,2,17,2,18,2,11,2,3,2,9,2,2,2,13,2,14,2, -19,2,21,50,11,11,11,16,3,2,23,2,20,2,24,16,3,11,11,11,16, -3,2,23,2,20,2,24,39,39,37,12,11,11,16,0,16,0,16,0,36,36, -11,12,11,11,16,0,16,0,16,0,36,36,16,22,20,15,16,2,88,163,36, -37,45,8,128,128,9,223,0,33,41,80,159,36,8,30,39,20,15,16,2,88, -163,8,36,37,45,8,240,0,0,1,0,9,223,0,33,42,80,159,36,8,29, -39,20,15,16,2,88,163,36,37,49,8,240,0,0,16,0,72,112,97,116,104, -45,115,115,45,62,114,107,116,223,0,33,43,80,159,36,8,28,39,20,15,16, -2,88,163,36,37,49,8,240,0,192,0,0,67,103,101,116,45,100,105,114,223, -0,33,44,80,159,36,8,27,39,20,15,16,2,88,164,8,34,37,45,8,240, -0,0,10,0,1,21,112,114,101,112,45,112,108,97,110,101,116,45,114,101,115, -111,108,118,101,114,33,37,224,1,0,33,45,80,159,36,8,26,39,20,15,16, -2,248,22,154,8,69,115,111,45,115,117,102,102,105,120,80,159,36,36,37,20, -15,16,2,88,163,36,38,8,38,8,61,2,3,223,0,33,54,80,159,36,37, -37,20,15,16,2,20,27,158,32,0,88,163,8,36,37,42,11,2,9,222,192, -32,0,88,163,8,36,37,42,11,2,9,222,192,80,159,36,42,37,20,15,16, -2,247,22,136,2,80,159,36,43,37,20,15,16,2,8,128,8,80,159,36,44, -37,20,15,16,2,249,22,158,8,8,128,8,11,80,159,36,45,37,20,15,16, -2,88,163,8,36,37,50,8,128,8,2,13,223,0,33,55,80,159,36,46,37, -20,15,16,2,88,163,8,36,38,55,8,128,8,2,14,223,0,33,56,80,159, -36,47,37,20,15,16,2,247,22,69,80,159,36,48,37,20,15,16,2,248,22, -18,74,109,111,100,117,108,101,45,108,111,97,100,105,110,103,80,159,36,49,37, -20,15,16,2,11,80,158,36,50,20,15,16,2,11,80,158,36,51,20,15,16, -2,32,0,88,163,36,38,8,25,11,2,19,222,33,62,80,159,36,52,37,20, -15,16,2,11,80,158,36,53,20,15,16,2,27,11,20,19,158,36,90,159,37, -10,89,161,37,36,10,20,25,96,2,21,88,163,8,36,37,51,8,128,2,9, -224,2,1,33,63,88,163,36,39,49,11,9,223,0,33,64,88,163,36,40,8, -32,16,2,8,176,242,8,240,115,124,0,0,9,224,2,1,33,77,207,80,159, -36,54,37,20,15,16,2,88,163,36,36,45,8,240,66,0,14,2,2,23,223, -0,33,78,80,159,36,59,37,20,15,16,2,20,27,158,88,163,8,36,36,45, -8,240,0,0,10,2,2,24,223,0,33,79,88,163,8,36,36,45,8,240,0, -0,10,2,2,24,223,0,33,80,80,159,36,8,24,37,96,29,94,2,4,68, -35,37,107,101,114,110,101,108,11,29,94,2,4,69,35,37,109,105,110,45,115, -116,120,11,2,5,2,22,9,9,9,36,0}; - EVAL_ONE_SIZED_STR((char *)expr, 7403); +23,195,1,80,158,37,51,27,248,22,140,5,23,197,2,27,28,248,22,71,23, +195,2,248,22,74,23,195,1,23,194,1,28,248,22,159,14,23,194,2,90,159, +39,11,89,161,39,36,11,248,22,180,14,23,197,1,86,95,20,18,159,11,80, +158,42,50,199,20,18,159,11,80,158,42,51,192,192,11,11,28,23,193,2,192, +86,94,23,193,1,27,247,22,164,5,28,192,192,247,22,136,15,28,24,194,2, +12,20,13,159,80,159,36,55,37,80,158,36,53,89,161,37,37,10,249,22,183, +4,21,94,2,26,6,19,19,112,108,97,110,101,116,47,114,101,115,111,108,118, +101,114,46,114,107,116,1,27,112,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,250,22,177,14,23,197, +1,23,199,1,249,80,159,43,39,39,23,198,1,2,29,250,22,177,14,23,197, +1,23,199,1,249,80,159,43,39,39,23,198,1,2,29,252,22,177,14,23,199, +1,23,201,1,2,30,247,22,155,8,249,80,159,45,39,39,23,200,1,80,159, +45,36,38,252,22,177,14,23,199,1,23,201,1,2,30,247,22,155,8,249,80, +159,45,39,39,23,200,1,80,159,45,36,38,27,252,22,177,14,23,200,1,23, +202,1,2,30,247,22,155,8,249,80,159,46,39,39,23,201,1,80,159,46,36, +38,27,250,22,130,15,196,11,32,0,88,163,8,36,36,41,11,9,222,11,28, +192,249,22,73,195,194,11,27,252,22,177,14,23,200,1,23,202,1,2,30,247, +22,155,8,249,80,159,46,39,39,23,201,1,80,159,46,36,38,27,250,22,130, +15,196,11,32,0,88,163,8,36,36,41,11,9,222,11,28,192,249,22,73,195, +194,11,27,250,22,177,14,23,198,1,23,200,1,249,80,159,44,39,39,23,199, +1,2,29,27,250,22,130,15,196,11,32,0,88,163,8,36,36,41,11,9,222, +11,28,192,249,22,73,195,194,11,27,250,22,177,14,23,198,1,23,200,1,249, +80,159,44,39,39,23,199,1,2,29,27,250,22,130,15,196,11,32,0,88,163, +8,36,36,41,11,9,222,11,28,192,249,22,73,195,194,11,86,95,28,248,80, +159,37,38,39,23,195,2,12,250,22,178,9,2,27,6,25,25,112,97,116,104, +32,111,114,32,118,97,108,105,100,45,112,97,116,104,32,115,116,114,105,110,103, +23,197,2,28,28,23,195,2,28,248,22,58,23,196,2,10,28,248,22,82,23, +196,2,28,249,22,186,3,248,22,86,23,198,2,37,28,28,248,22,58,248,22, +74,23,197,2,10,248,22,140,9,248,22,74,23,197,2,249,22,4,22,58,248, +22,75,23,198,2,11,11,11,10,12,250,22,178,9,2,27,6,71,71,35,102, +44,32,115,121,109,98,111,108,44,32,108,105,115,116,32,40,108,101,110,103,116, +104,32,50,32,111,114,32,109,111,114,101,41,32,111,102,32,115,121,109,98,111, +108,32,111,114,32,35,102,32,102,111,108,108,111,119,101,100,32,98,121,32,115, +121,109,98,111,108,115,23,197,2,90,159,46,11,89,161,37,36,11,28,248,22, +183,14,23,205,2,23,204,2,27,247,22,164,5,28,23,193,2,249,22,184,14, +23,207,2,23,195,1,23,205,2,89,161,39,37,11,248,22,180,14,23,205,1, +86,94,23,196,1,89,161,38,40,11,28,23,205,2,27,248,22,164,14,23,197, +2,27,248,22,190,7,23,195,2,28,28,249,22,188,3,23,195,2,40,249,22, +129,8,2,25,249,22,132,8,23,198,2,249,22,176,3,23,199,2,40,11,249, +22,7,23,199,2,248,22,168,14,249,22,133,8,250,22,132,8,23,202,1,36, +249,22,176,3,23,203,1,40,5,3,46,115,115,249,22,7,23,199,2,11,249, +22,7,23,197,2,11,89,161,37,42,11,28,249,22,142,9,23,199,2,23,197, +2,23,193,2,249,22,177,14,23,196,2,23,199,2,89,161,37,43,11,28,23, +198,2,28,249,22,142,9,23,200,2,23,197,1,23,193,1,86,94,23,193,1, +249,22,177,14,23,196,2,23,200,2,86,94,23,195,1,11,89,161,37,44,11, +28,249,22,142,9,23,196,2,68,114,101,108,97,116,105,118,101,86,94,23,194, +1,2,28,23,194,1,89,161,37,45,11,247,22,138,15,27,250,22,130,15,23, +203,2,11,32,0,88,163,8,36,36,41,11,9,222,11,27,28,23,194,2,249, +22,73,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,130,15,23,207,2,11,32,0,88,163,8,36,36,41,11, +9,222,11,28,192,249,22,73,23,206,2,194,11,11,27,28,23,195,2,23,195, +2,23,194,2,27,88,163,36,37,50,44,62,122,111,225,15,13,9,33,46,27, +88,163,36,37,50,44,66,97,108,116,45,122,111,225,16,14,11,33,47,27,88, +163,36,37,52,45,9,225,17,15,11,33,48,27,88,163,36,37,52,45,9,225, +18,16,13,33,49,27,28,23,200,2,23,200,2,248,22,140,9,23,200,2,27, +28,23,208,2,28,23,200,2,86,94,23,201,1,23,200,2,248,22,140,9,23, +202,1,11,27,28,23,195,2,28,23,197,1,27,249,22,5,88,163,8,36,37, +53,45,9,225,24,22,18,33,50,23,216,2,27,28,23,202,2,11,193,28,192, +192,28,193,28,23,202,2,28,249,22,188,3,248,22,75,196,248,22,75,23,205, +2,193,11,11,11,11,86,94,23,197,1,11,28,23,193,2,86,105,23,213,1, +23,211,1,23,210,1,23,209,1,23,208,1,23,201,1,23,200,1,23,199,1, +23,198,1,23,196,1,23,195,1,23,194,1,20,13,159,80,159,57,40,37,250, +80,159,8,24,41,37,249,22,27,11,80,159,8,26,40,37,22,182,4,11,20, +13,159,80,159,57,40,37,250,80,159,8,24,41,37,249,22,27,11,80,159,8, +26,40,37,22,164,5,28,248,22,159,14,23,216,2,23,215,1,86,94,23,215, +1,247,22,136,15,249,247,22,142,15,248,22,74,195,23,25,86,94,23,193,1, +27,28,23,195,2,28,23,197,1,27,249,22,5,88,163,8,36,37,53,45,9, +225,25,23,20,33,51,23,217,2,27,28,23,204,2,11,193,28,192,192,28,193, +28,203,28,249,22,188,3,248,22,75,196,248,22,75,206,193,11,11,11,11,86, +94,23,197,1,11,28,23,193,2,86,102,23,214,1,23,211,1,23,210,1,23, +209,1,23,201,1,23,200,1,23,199,1,23,196,1,23,195,1,20,13,159,80, +159,58,40,37,250,80,159,8,25,41,37,249,22,27,11,80,159,8,27,40,37, +22,182,4,23,215,1,20,13,159,80,159,58,40,37,250,80,159,8,25,41,37, +249,22,27,11,80,159,8,27,40,37,22,164,5,28,248,22,159,14,23,217,2, +23,216,1,86,94,23,216,1,247,22,136,15,249,247,22,142,15,248,22,74,195, +23,26,86,94,23,193,1,27,28,23,197,2,28,23,201,1,27,249,22,5,20, +20,94,88,163,8,36,37,51,44,9,225,26,24,20,33,52,23,213,1,23,218, +2,27,28,23,204,2,11,193,28,192,192,28,193,28,23,204,2,28,249,22,188, +3,248,22,75,196,248,22,75,23,207,2,193,11,11,11,86,94,23,210,1,11, +86,94,23,201,1,11,28,23,193,2,86,101,23,215,1,23,213,1,23,212,1, +23,211,1,23,202,1,23,200,1,23,197,1,23,196,1,20,13,159,80,159,59, +40,37,250,80,159,8,26,41,37,249,22,27,11,80,159,8,28,40,37,22,182, +4,11,20,13,159,80,159,59,40,37,250,80,159,8,26,41,37,249,22,27,11, +80,159,8,28,40,37,22,164,5,28,248,22,159,14,23,218,2,23,217,1,86, +94,23,217,1,247,22,136,15,249,247,22,162,5,248,22,74,195,23,27,86,94, +23,193,1,27,28,23,197,1,28,23,201,1,27,249,22,5,20,20,94,88,163, +8,36,37,51,44,9,225,27,25,22,33,53,23,215,1,23,219,1,27,28,23, +205,2,11,193,28,192,192,28,193,28,204,28,249,22,188,3,248,22,75,196,248, +22,75,23,15,193,11,11,11,86,95,23,216,1,23,212,1,11,86,94,23,201, +1,11,28,23,193,2,86,95,23,213,1,23,198,1,20,13,159,80,159,8,24, +40,37,250,80,159,8,27,41,37,249,22,27,11,80,159,8,29,40,37,22,182, +4,23,217,1,20,13,159,80,159,8,24,40,37,250,80,159,8,27,41,37,249, +22,27,11,80,159,8,29,40,37,22,164,5,28,248,22,159,14,23,219,2,23, +218,1,86,94,23,218,1,247,22,136,15,249,247,22,162,5,248,22,74,195,23, +28,86,94,23,193,1,28,28,248,22,71,23,220,2,248,22,74,23,220,2,10, +27,28,23,199,2,86,94,23,215,1,23,214,1,86,94,23,214,1,23,215,1, +28,28,248,22,71,23,221,2,248,22,140,9,248,22,171,14,23,195,2,11,12, +20,13,159,80,159,8,25,40,37,250,80,159,8,28,41,37,249,22,27,11,80, +159,8,30,40,37,22,182,4,28,23,30,28,23,202,1,11,195,86,94,23,202, +1,11,20,13,159,80,159,8,25,40,37,250,80,159,8,28,41,37,249,22,27, +11,80,159,8,30,40,37,22,164,5,28,248,22,159,14,23,220,2,23,219,1, +86,94,23,219,1,247,22,136,15,249,247,22,162,5,194,23,29,12,27,249,22, +162,8,80,159,39,45,38,249,22,183,3,248,22,179,3,248,22,166,2,200,8, +128,8,27,28,193,248,22,169,2,194,11,28,192,27,249,22,96,198,195,28,192, +248,22,75,193,11,11,27,249,22,183,3,248,22,179,3,248,22,166,2,198,8, +128,8,27,249,22,162,8,80,159,40,45,38,195,27,28,193,248,22,169,2,194, +11,250,22,163,8,80,159,42,45,38,197,248,22,168,2,249,22,73,249,22,73, +204,205,28,198,198,9,0,17,35,114,120,34,94,40,46,42,63,41,47,40,46, +42,41,36,34,32,58,88,163,8,36,37,59,11,2,31,222,33,59,27,249,22, +147,15,2,57,23,196,2,28,23,193,2,86,94,23,194,1,249,22,73,248,22, +98,23,196,2,27,248,22,107,23,197,1,27,249,22,147,15,2,57,23,196,2, +28,23,193,2,86,94,23,194,1,249,22,73,248,22,98,23,196,2,27,248,22, +107,23,197,1,27,249,22,147,15,2,57,23,196,2,28,23,193,2,86,94,23, +194,1,249,22,73,248,22,98,23,196,2,27,248,22,107,23,197,1,27,249,22, +147,15,2,57,23,196,2,28,23,193,2,86,94,23,194,1,249,22,73,248,22, +98,23,196,2,248,2,58,248,22,107,23,197,1,248,22,83,194,248,22,83,194, +248,22,83,194,248,22,83,194,32,60,88,163,36,37,55,11,2,31,222,33,61, +28,248,22,81,248,22,75,23,195,2,249,22,7,9,248,22,74,195,90,159,38, +11,89,161,38,36,11,27,248,22,75,196,28,248,22,81,248,22,75,23,195,2, +249,22,7,9,248,22,74,195,90,159,38,11,89,161,38,36,11,27,248,22,75, +196,28,248,22,81,248,22,75,23,195,2,249,22,7,9,248,22,74,195,90,159, +38,11,89,161,38,36,11,248,2,60,248,22,75,196,249,22,7,249,22,73,248, +22,74,199,196,195,249,22,7,249,22,73,248,22,74,199,196,195,249,22,7,249, +22,73,248,22,74,199,196,195,27,27,249,22,147,15,2,57,23,197,2,28,23, +193,2,86,94,23,195,1,249,22,73,248,22,98,23,196,2,27,248,22,107,23, +197,1,27,249,22,147,15,2,57,23,196,2,28,23,193,2,86,94,23,194,1, +249,22,73,248,22,98,23,196,2,27,248,22,107,23,197,1,27,249,22,147,15, +2,57,23,196,2,28,23,193,2,86,94,23,194,1,249,22,73,248,22,98,23, +196,2,27,248,22,107,23,197,1,27,249,22,147,15,2,57,23,196,2,28,23, +193,2,86,94,23,194,1,249,22,73,248,22,98,23,196,2,248,2,58,248,22, +107,23,197,1,248,22,83,194,248,22,83,194,248,22,83,194,248,22,83,195,28, +23,195,1,192,28,248,22,81,248,22,75,23,195,2,249,22,7,9,248,22,74, +195,27,248,22,75,194,90,159,38,11,89,161,38,36,11,28,248,22,81,248,22, +75,23,197,2,249,22,7,9,248,22,74,197,27,248,22,75,196,90,159,38,11, +89,161,38,36,11,28,248,22,81,248,22,75,23,197,2,249,22,7,9,248,22, +74,197,90,159,38,11,89,161,38,36,11,248,2,60,248,22,75,198,249,22,7, +249,22,73,248,22,74,201,196,195,249,22,7,249,22,73,248,22,74,202,196,195, +249,22,7,249,22,73,248,22,74,200,196,195,86,95,28,248,22,138,5,195,12, +250,22,178,9,2,21,6,20,20,114,101,115,111,108,118,101,100,45,109,111,100, +117,108,101,45,112,97,116,104,197,28,24,193,2,248,24,194,1,195,86,94,23, +193,1,12,27,250,22,153,2,80,159,41,43,38,248,22,172,15,247,22,137,13, +11,27,28,23,194,2,193,86,94,23,194,1,27,247,22,133,2,86,94,250,22, +151,2,80,159,43,43,38,248,22,172,15,247,22,137,13,195,192,250,22,151,2, +195,199,66,97,116,116,97,99,104,251,211,197,198,199,10,32,65,88,163,36,38, +47,11,76,102,108,97,116,116,101,110,45,115,117,98,45,112,97,116,104,222,33, +68,32,66,88,163,36,40,54,11,2,31,222,33,67,28,248,22,81,23,197,2, +28,248,22,81,195,192,249,22,73,194,248,22,88,197,28,249,22,144,9,248,22, +74,23,199,2,2,33,28,248,22,81,23,196,2,86,95,23,196,1,23,195,1, +250,22,175,9,2,21,6,37,37,116,111,111,32,109,97,110,121,32,34,46,46, +34,115,32,105,110,32,115,117,98,109,111,100,117,108,101,32,112,97,116,104,58, +32,126,46,115,250,22,84,2,32,28,249,22,144,9,23,201,2,2,34,198,28, +248,22,159,14,199,198,249,22,83,28,248,22,58,201,2,4,2,35,200,199,251, +2,66,196,197,248,22,75,199,248,22,75,200,251,2,66,196,197,249,22,73,248, +22,74,202,200,248,22,75,200,251,2,66,196,197,9,197,27,249,22,155,7,6, +31,31,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,58,32,196,28,193,250,22,177,9,11,195, +196,248,22,175,9,193,28,249,22,138,7,194,2,34,2,28,28,249,22,138,7, +194,2,33,62,117,112,192,32,71,88,163,8,36,37,50,11,67,115,115,45,62, +114,107,116,222,33,72,27,248,22,135,7,194,28,249,22,188,3,194,39,28,249, +22,138,7,6,3,3,46,115,115,249,22,154,7,197,249,22,176,3,198,39,249, +22,155,7,250,22,154,7,198,36,249,22,176,3,199,39,2,38,193,193,0,8, +35,114,120,34,91,46,93,34,28,249,22,144,9,248,22,75,23,200,2,23,197, +1,28,249,22,142,9,248,22,74,23,200,2,23,196,1,251,22,175,9,2,21, +6,28,28,99,121,99,108,101,32,105,110,32,108,111,97,100,105,110,103,32,97, +116,32,126,46,115,58,32,126,46,115,23,200,1,249,22,2,22,75,248,22,88, +249,22,73,23,206,1,23,202,1,12,12,247,192,20,13,159,80,159,43,48,38, +249,22,73,249,22,73,248,22,172,15,247,22,137,13,23,201,1,23,195,1,20, +13,159,80,159,43,40,37,250,80,159,46,41,37,249,22,27,11,80,159,48,40, +37,22,181,4,23,198,2,249,247,22,163,5,23,200,1,27,248,22,61,248,22, +163,14,23,201,1,28,23,202,2,28,250,22,153,2,23,200,1,23,201,1,11, +249,22,73,11,203,249,22,73,194,203,192,86,94,28,28,248,22,159,14,23,196, +2,10,248,22,148,5,23,196,2,12,28,23,197,2,250,22,177,9,11,6,15, +15,98,97,100,32,109,111,100,117,108,101,32,112,97,116,104,23,200,2,250,22, +178,9,2,21,6,19,19,109,111,100,117,108,101,45,112,97,116,104,32,111,114, +32,112,97,116,104,23,198,2,28,28,248,22,71,23,196,2,249,22,142,9,248, +22,74,23,198,2,2,4,11,248,22,139,5,248,22,98,196,28,28,248,22,71, +23,196,2,28,249,22,142,9,248,22,74,23,198,2,2,32,28,248,22,71,248, +22,98,23,197,2,249,22,142,9,248,22,102,23,198,2,2,4,11,11,11,86, +97,23,198,1,23,197,1,23,196,1,23,193,1,248,22,139,5,249,2,65,248, +22,115,23,199,2,248,22,100,23,199,1,28,28,248,22,71,23,196,2,28,249, +22,142,9,248,22,74,23,198,2,2,32,28,28,249,22,144,9,248,22,98,23, +198,2,2,34,10,249,22,144,9,248,22,98,23,198,2,2,33,28,23,196,2, +27,248,22,140,5,23,198,2,28,248,22,58,193,10,28,248,22,71,193,248,22, +58,248,22,74,194,11,11,11,11,11,86,96,23,198,1,23,197,1,23,193,1, +27,248,22,140,5,23,198,1,248,22,139,5,249,2,65,28,248,22,71,23,197, +2,248,22,74,23,197,2,23,196,2,27,28,249,22,144,9,248,22,98,23,203, +2,2,33,248,22,75,200,248,22,100,200,28,248,22,71,23,198,2,249,22,87, +248,22,75,199,194,192,28,28,248,22,71,23,196,2,249,22,142,9,248,22,74, +23,198,2,2,36,11,86,94,248,80,159,38,8,26,39,193,253,213,200,201,202, +203,11,80,158,43,53,28,28,248,22,71,23,196,2,28,249,22,142,9,248,22, +74,23,198,2,2,32,28,248,22,71,248,22,98,23,197,2,249,22,142,9,248, +22,102,23,198,2,2,36,11,11,11,86,94,248,80,159,38,8,26,39,193,253, +213,248,22,98,201,201,202,203,248,22,100,201,80,158,43,53,86,94,23,193,1, +27,88,163,8,36,37,47,11,79,115,104,111,119,45,99,111,108,108,101,99,116, +105,111,110,45,101,114,114,223,5,33,69,27,28,248,22,71,23,198,2,28,249, +22,142,9,2,32,248,22,74,23,200,2,27,248,22,98,23,199,2,28,28,249, +22,144,9,23,195,2,2,34,10,249,22,144,9,23,195,2,2,33,86,94,23, +193,1,28,23,199,2,27,248,22,140,5,23,201,2,28,248,22,71,193,248,22, +74,193,192,250,22,175,9,2,21,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,71,23,199,2,28,249,22,142,9,2,32,248,22, +74,23,201,2,27,28,28,28,249,22,144,9,248,22,98,23,202,2,2,34,10, +249,22,144,9,248,22,98,23,202,2,2,33,23,200,2,11,27,248,22,140,5, +23,202,2,27,28,249,22,144,9,248,22,98,23,204,2,2,33,248,22,75,23, +202,1,248,22,100,23,202,1,28,248,22,71,23,195,2,249,2,65,248,22,74, +23,197,2,249,22,87,248,22,75,23,199,1,23,197,1,249,2,65,23,196,1, +23,195,1,249,2,65,2,34,28,249,22,144,9,248,22,98,23,204,2,2,33, +248,22,75,23,202,1,248,22,100,23,202,1,28,248,22,71,193,248,22,75,193, +11,11,11,27,28,248,22,58,23,196,2,27,248,80,159,43,46,39,249,22,73, +23,199,2,247,22,137,15,28,23,193,2,192,86,94,23,193,1,90,159,38,11, +89,161,38,36,11,249,80,159,46,52,39,248,22,64,23,201,2,11,27,28,248, +22,81,23,195,2,2,37,249,22,155,7,23,197,2,2,38,251,80,159,49,57, +39,23,204,1,28,248,22,81,23,199,2,23,199,1,86,94,23,199,1,248,22, +74,23,199,2,28,248,22,81,23,199,2,86,94,23,198,1,9,248,22,75,23, +199,1,23,197,1,28,248,22,132,7,23,196,2,86,94,23,196,1,27,248,80, +159,43,8,27,39,23,202,2,27,248,80,159,44,46,39,249,22,73,23,200,2, +23,197,2,28,23,193,2,192,86,94,23,193,1,90,159,38,11,89,161,38,36, +11,249,80,159,47,52,39,23,201,2,11,250,22,1,22,177,14,23,199,1,249, +22,87,249,22,2,32,0,88,163,8,36,37,44,11,9,222,33,70,23,200,1, +248,22,83,248,2,71,23,201,1,28,248,22,159,14,23,196,2,86,94,23,196, +1,248,80,159,42,8,28,39,248,22,186,14,28,248,22,183,14,23,198,2,23, +197,2,249,22,184,14,23,199,2,248,80,159,46,8,27,39,23,205,2,28,249, +22,142,9,248,22,74,23,198,2,2,26,27,248,80,159,43,46,39,249,22,73, +23,199,2,247,22,137,15,28,23,193,2,192,86,94,23,193,1,90,159,39,11, +89,161,38,36,11,249,80,159,47,52,39,248,22,98,23,202,2,11,89,161,37, +38,11,28,248,22,81,248,22,100,23,201,2,28,248,22,81,23,194,2,249,22, +151,15,2,73,23,196,2,11,10,27,28,23,196,2,248,2,71,23,196,2,28, +248,22,81,23,195,2,2,37,28,249,22,151,15,2,73,23,197,2,248,2,71, +23,196,2,249,22,155,7,23,197,2,2,38,27,28,23,197,1,86,94,23,196, +1,249,22,87,28,248,22,81,248,22,100,23,205,2,21,93,6,5,5,109,122, +108,105,98,249,22,1,22,87,249,22,2,80,159,53,8,29,39,248,22,100,23, +208,2,23,197,1,28,248,22,81,23,196,2,86,94,23,195,1,248,22,83,23, +197,1,86,94,23,196,1,23,195,1,251,80,159,51,57,39,23,206,1,248,22, +74,23,198,2,248,22,75,23,198,1,23,198,1,28,249,22,142,9,248,22,74, +23,198,2,2,35,248,80,159,42,8,28,39,248,22,186,14,249,22,184,14,248, +22,188,14,248,22,98,23,201,2,248,80,159,46,8,27,39,23,205,2,12,86, +94,28,28,248,22,159,14,23,194,2,10,248,22,157,8,23,194,2,86,94,23, +201,1,12,28,23,201,2,250,22,177,9,67,114,101,113,117,105,114,101,249,22, +180,7,6,17,17,98,97,100,32,109,111,100,117,108,101,32,112,97,116,104,126, +97,28,23,198,2,248,22,74,23,199,2,2,39,23,204,1,86,94,23,201,1, +250,22,178,9,2,21,249,22,180,7,6,13,13,109,111,100,117,108,101,32,112, +97,116,104,126,97,28,23,198,2,248,22,74,23,199,2,2,39,23,198,2,27, +28,248,22,157,8,23,195,2,249,22,162,8,23,196,2,36,249,22,186,14,248, +22,187,14,23,197,2,11,27,28,248,22,157,8,23,196,2,249,22,162,8,23, +197,2,37,248,80,159,44,58,39,23,195,2,90,159,39,11,89,161,39,36,11, +28,248,22,157,8,23,199,2,250,22,7,2,40,249,22,162,8,23,203,2,38, +2,40,248,22,180,14,23,198,2,86,95,23,195,1,23,193,1,27,28,248,22, +157,8,23,200,2,249,22,162,8,23,201,2,39,249,80,159,49,56,39,23,197, +2,5,0,27,28,248,22,157,8,23,201,2,249,22,162,8,23,202,2,40,248, +22,139,5,23,200,2,27,250,22,153,2,80,159,52,43,38,248,22,172,15,247, +22,137,13,11,27,28,23,194,2,23,194,1,86,94,23,194,1,27,247,22,133, +2,86,94,250,22,151,2,80,159,54,43,38,248,22,172,15,247,22,137,13,195, +192,27,28,23,204,2,248,22,139,5,249,22,73,248,22,140,5,23,200,2,23, +207,2,23,196,2,86,95,28,23,212,1,27,250,22,153,2,23,198,2,196,11, +28,23,193,1,12,86,94,27,27,28,248,22,17,80,159,55,49,38,80,159,54, +49,38,247,22,19,251,22,27,11,80,159,58,48,38,9,23,197,1,27,248,22, +172,15,247,22,137,13,86,94,249,22,3,20,20,94,88,163,8,36,37,55,11, +9,226,14,13,2,3,33,74,23,195,1,23,196,2,248,28,248,22,17,80,159, +56,49,38,32,0,88,163,36,37,42,11,9,222,33,75,80,159,55,8,30,39, +20,20,95,88,163,36,36,55,8,176,64,9,230,19,15,13,12,8,7,5,2, +33,76,23,195,1,23,208,1,250,22,151,2,23,198,1,196,10,12,28,28,248, +22,157,8,23,204,1,11,28,248,22,132,7,23,206,2,10,28,248,22,58,23, +206,2,10,28,248,22,71,23,206,2,249,22,142,9,248,22,74,23,208,2,2, +26,11,249,80,159,53,47,39,28,248,22,132,7,23,208,2,249,22,73,23,209, +1,248,80,159,56,8,27,39,23,215,1,86,94,23,212,1,249,22,73,23,209, +1,247,22,137,15,252,22,159,8,23,209,1,23,208,1,23,206,1,23,204,1, +23,203,1,12,192,86,96,20,18,159,11,80,158,36,53,248,80,159,37,8,25, +37,249,22,27,11,80,159,39,55,37,248,22,180,4,80,159,37,54,38,248,22, +163,5,80,159,37,37,39,248,22,128,14,80,159,37,42,39,20,18,159,11,80, +158,36,53,248,80,159,37,8,25,37,249,22,27,11,80,159,39,55,37,20,18, +159,11,80,158,36,53,248,80,159,37,8,25,37,249,22,27,11,80,159,39,55, +37,159,36,20,113,159,36,16,1,11,16,0,20,26,144,9,2,1,2,1,29, +11,11,9,9,11,11,11,10,38,80,158,36,36,20,113,159,41,16,26,2,2, +2,3,30,2,5,72,112,97,116,104,45,115,116,114,105,110,103,63,11,30,2, +5,75,112,97,116,104,45,97,100,100,45,115,117,102,102,105,120,8,30,2,7, +2,8,6,30,2,7,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,3,2,9,2,10,2,11,2,12,2,13, +2,14,2,15,2,16,2,17,2,18,2,19,2,20,2,21,30,2,22,2,8, +6,30,2,5,79,112,97,116,104,45,114,101,112,108,97,99,101,45,115,117,102, +102,105,120,10,30,2,5,73,102,105,110,100,45,99,111,108,45,102,105,108,101, +3,30,2,5,76,110,111,114,109,97,108,45,99,97,115,101,45,112,97,116,104, +7,2,23,2,24,30,2,22,74,114,101,112,97,114,97,109,101,116,101,114,105, +122,101,7,16,0,37,39,36,16,0,36,16,14,2,15,2,16,2,10,2,12, +2,17,2,18,2,11,2,3,2,9,2,2,2,13,2,14,2,19,2,21,50, +11,11,11,16,3,2,23,2,20,2,24,16,3,11,11,11,16,3,2,23,2, +20,2,24,39,39,37,12,11,11,16,0,16,0,16,0,36,36,11,12,11,11, +16,0,16,0,16,0,36,36,16,22,20,15,16,2,88,163,36,37,45,8,128, +128,9,223,0,33,41,80,159,36,8,30,39,20,15,16,2,88,163,8,36,37, +45,8,240,0,0,1,0,9,223,0,33,42,80,159,36,8,29,39,20,15,16, +2,88,163,36,37,49,8,240,0,0,16,0,72,112,97,116,104,45,115,115,45, +62,114,107,116,223,0,33,43,80,159,36,8,28,39,20,15,16,2,88,163,36, +37,50,8,240,0,192,0,0,67,103,101,116,45,100,105,114,223,0,33,44,80, +159,36,8,27,39,20,15,16,2,88,164,8,34,37,45,8,240,0,0,10,0, +1,21,112,114,101,112,45,112,108,97,110,101,116,45,114,101,115,111,108,118,101, +114,33,37,224,1,0,33,45,80,159,36,8,26,39,20,15,16,2,248,22,154, +8,69,115,111,45,115,117,102,102,105,120,80,159,36,36,37,20,15,16,2,88, +163,36,38,8,38,8,61,2,3,223,0,33,54,80,159,36,37,37,20,15,16, +2,20,27,158,32,0,88,163,8,36,37,42,11,2,9,222,192,32,0,88,163, +8,36,37,42,11,2,9,222,192,80,159,36,42,37,20,15,16,2,247,22,136, +2,80,159,36,43,37,20,15,16,2,8,128,8,80,159,36,44,37,20,15,16, +2,249,22,158,8,8,128,8,11,80,159,36,45,37,20,15,16,2,88,163,8, +36,37,50,8,128,8,2,13,223,0,33,55,80,159,36,46,37,20,15,16,2, +88,163,8,36,38,55,8,128,8,2,14,223,0,33,56,80,159,36,47,37,20, +15,16,2,247,22,69,80,159,36,48,37,20,15,16,2,248,22,18,74,109,111, +100,117,108,101,45,108,111,97,100,105,110,103,80,159,36,49,37,20,15,16,2, +11,80,158,36,50,20,15,16,2,11,80,158,36,51,20,15,16,2,32,0,88, +163,36,38,8,25,11,2,19,222,33,62,80,159,36,52,37,20,15,16,2,11, +80,158,36,53,20,15,16,2,27,11,20,19,158,36,90,159,37,10,89,161,37, +36,10,20,25,96,2,21,88,163,8,36,37,51,8,128,2,9,224,2,1,33, +63,88,163,36,39,49,11,9,223,0,33,64,88,163,36,40,8,32,16,2,8, +176,242,8,240,115,124,0,0,9,224,2,1,33,77,207,80,159,36,54,37,20, +15,16,2,88,163,36,36,45,8,240,66,0,14,2,2,23,223,0,33,78,80, +159,36,59,37,20,15,16,2,20,27,158,88,163,8,36,36,45,8,240,0,0, +10,2,2,24,223,0,33,79,88,163,8,36,36,45,8,240,0,0,10,2,2, +24,223,0,33,80,80,159,36,8,24,37,96,29,94,2,4,68,35,37,107,101, +114,110,101,108,11,29,94,2,4,69,35,37,109,105,110,45,115,116,120,11,2, +5,2,22,9,9,9,36,0}; + EVAL_ONE_SIZED_STR((char *)expr, 7420); } { SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,51,46,48,46,50,84,0,0,0,0,0,0,0,0,0,0, @@ -991,7 +992,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,244,83, +29,94,2,2,68,35,37,107,101,114,110,101,108,11,97,36,11,8,240,246,83, 0,0,100,159,2,3,36,36,159,2,4,36,36,159,2,5,36,36,159,2,6, 36,36,159,2,7,36,36,159,2,8,36,36,159,2,9,36,36,159,2,9,36, 36,16,0,159,36,20,113,159,36,16,1,11,16,0,20,26,144,9,2,1,2, diff --git a/src/racket/src/startup.inc b/src/racket/src/startup.inc index 4ff49970b3..498d8de42e 100644 --- a/src/racket/src/startup.inc +++ b/src/racket/src/startup.inc @@ -889,11 +889,12 @@ "(if(eq? relto -prev-relto)" " -prev-relto-dir" "(let((p(resolved-module-path-name relto)))" +"(let((p(if(pair? p)(car p) p)))" "(and(path? p)" "(let-values(((base n d?)(split-path p)))" "(set! -prev-relto relto)" "(set! -prev-relto-dir base)" -" base)))))" +" base))))))" "(current-load-relative-directory)" "(current-directory))))" "(show-collection-err(lambda(s)" diff --git a/src/racket/src/startup.rktl b/src/racket/src/startup.rktl index 7bd1d1d6cc..734bf3a4ed 100644 --- a/src/racket/src/startup.rktl +++ b/src/racket/src/startup.rktl @@ -1017,11 +1017,12 @@ (if (eq? relto -prev-relto) -prev-relto-dir (let ([p (resolved-module-path-name relto)]) - (and (path? p) - (let-values ([(base n d?) (split-path p)]) - (set! -prev-relto relto) - (set! -prev-relto-dir base) - base))))) + (let ([p (if (pair? p) (car p) p)]) + (and (path? p) + (let-values ([(base n d?) (split-path p)]) + (set! -prev-relto relto) + (set! -prev-relto-dir base) + base)))))) (current-load-relative-directory) (current-directory)))] [show-collection-err (lambda (s)