From 542f19c00e42ae75830a53f129ef1604b435bcf8 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 12 Mar 2012 20:55:45 -0600 Subject: [PATCH] fix default `load/use-compiled' handler A module shouldn't be loaded from source to find a submodule if a module for the source is already declared. --- src/racket/src/cstartup.inc | 466 ++++++++++++++++++------------------ src/racket/src/module.c | 2 +- src/racket/src/startup.inc | 3 +- src/racket/src/startup.rktl | 3 +- 4 files changed, 238 insertions(+), 236 deletions(-) diff --git a/src/racket/src/cstartup.inc b/src/racket/src/cstartup.inc index 4343d51795..2190700ddf 100644 --- a/src/racket/src/cstartup.inc +++ b/src/racket/src/cstartup.inc @@ -16,12 +16,12 @@ 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, -158,77,0,0,95,159,2,17,36,36,159,2,16,36,36,159,2,16,36,36,16, +160,77,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,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,158,77,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,158,77,0,0,16,0,96,11,11, -8,240,158,77,0,0,16,0,18,98,64,104,101,114,101,13,16,5,36,2,14, +37,11,8,240,160,77,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,160,77,0,0,16,0,96,11,11, +8,240,160,77,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, @@ -30,14 +30,14 @@ 194,248,22,74,193,249,22,149,4,80,158,39,36,251,22,83,2,18,248,22,74, 199,249,22,73,2,6,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,50,51,57,16,4,11,11,2,21,3,1,8,101,110,118,49,53, -50,52,48,27,248,22,75,248,22,156,4,196,28,248,22,81,193,20,14,159,37, +110,118,49,53,50,52,48,16,4,11,11,2,21,3,1,8,101,110,118,49,53, +50,52,49,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,7,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,50,52,50,16,4,11,11,2,21,3, -1,8,101,110,118,49,53,50,52,51,248,22,156,4,193,27,248,22,156,4,194, +11,2,20,3,1,8,101,110,118,49,53,50,52,51,16,4,11,11,2,21,3, +1,8,101,110,118,49,53,50,52,52,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, @@ -67,8 +67,8 @@ 28,249,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,11,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,50,54,53,16,4,11,11,2,21, -3,1,8,101,110,118,49,53,50,54,54,18,158,94,10,64,118,111,105,100,8, +11,11,2,20,3,1,8,101,110,118,49,53,50,54,54,16,4,11,11,2,21, +3,1,8,101,110,118,49,53,50,54,55,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, @@ -632,10 +632,10 @@ 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,118,1,123,1,128,1,137,1,142,1,149,1,154,1,158, 1,163,1,170,1,174,1,185,1,192,1,195,1,203,1,212,1,220,1,21,2, -124,2,145,2,166,2,196,2,226,2,28,3,86,3,135,3,184,3,16,10,67, -10,130,10,149,10,163,10,65,11,78,11,212,11,254,12,121,13,127,13,155,13, -168,13,65,14,72,14,126,14,148,14,168,14,223,14,233,14,64,15,66,15,169, -15,175,23,228,23,252,23,20,24,0,0,150,27,0,0,66,35,37,98,111,111, +124,2,145,2,166,2,196,2,226,2,28,3,86,3,135,3,184,3,32,10,83, +10,146,10,165,10,179,10,81,11,94,11,228,11,14,13,137,13,143,13,171,13, +184,13,81,14,88,14,142,14,164,14,184,14,239,14,249,14,80,15,82,15,185, +15,191,23,244,23,12,24,36,24,0,0,166,27,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, @@ -751,229 +751,229 @@ 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,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,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,57,88,163,8,36, -37,59,11,2,30,222,33,58,27,249,22,147,15,2,56,23,196,2,28,23,193, +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,57,88,163,8,36,37,59,11,2,30, +222,33,58,27,249,22,147,15,2,56,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,56,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,56,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,56,23,196,2,28,23,193,2,86,94,23,194, +1,249,22,73,248,22,98,23,196,2,248,2,57,248,22,107,23,197,1,248,22, +83,194,248,22,83,194,248,22,83,194,248,22,83,194,32,59,88,163,36,37,55, +11,2,30,222,33,60,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,59,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, +56,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,56,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,56,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, 56,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,56,23,196,2,28,23,193, -2,86,94,23,194,1,249,22,73,248,22,98,23,196,2,248,2,57,248,22,107, -23,197,1,248,22,83,194,248,22,83,194,248,22,83,194,248,22,83,194,32,59, -88,163,36,37,55,11,2,30,222,33,60,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,59, -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,56,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,56,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,56,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,56,23,196,2,28,23,193,2,86,94,23,194,1,249,22,73, -248,22,98,23,196,2,248,2,57,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,59,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,64,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,67,32,65,88,163,36,40,54,11,2, -30,222,33,66,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,32,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,31,28, -249,22,144,9,200,2,33,198,249,22,83,28,248,22,58,201,2,4,2,34,200, -199,251,2,65,196,197,248,22,75,199,248,22,75,200,251,2,65,196,197,249,22, -73,248,22,74,202,200,248,22,75,200,251,2,65,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,33,2,27,28,249,22, -138,7,194,2,32,62,117,112,192,32,70,88,163,8,36,37,50,11,67,115,115, -45,62,114,107,116,222,33,71,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,197,2,10,248,22,148,5,23,197,2,12,28,23,198,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,201,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,199,2,28,28,248,22,71,23,197,2,249,22,142, -9,248,22,74,23,199,2,2,4,11,248,22,139,5,248,22,98,197,28,28,248, -22,71,23,197,2,28,249,22,142,9,248,22,74,23,199,2,2,31,28,248,22, -71,248,22,98,23,198,2,249,22,142,9,248,22,102,23,199,2,2,4,11,11, -11,86,98,23,199,1,23,198,1,23,197,1,23,194,1,23,193,1,248,22,139, -5,249,2,64,248,22,115,23,200,2,248,22,100,23,200,1,28,28,248,22,71, -23,197,2,28,249,22,142,9,248,22,74,23,199,2,2,31,28,249,22,144,9, -248,22,98,23,199,2,2,33,28,23,197,2,27,248,22,140,5,23,199,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,97,23,199,1,23,198,1,23,194,1,23,193,1,27,248,22,140,5,23, -199,1,248,22,139,5,249,2,64,28,248,22,71,23,197,2,248,22,74,23,197, -2,23,196,2,28,248,22,71,23,197,2,249,22,87,248,22,75,23,199,1,248, -22,100,23,203,1,86,94,23,196,1,248,22,100,23,201,1,28,28,248,22,71, -23,197,2,249,22,142,9,248,22,74,23,199,2,2,35,11,86,94,23,193,1, -86,94,28,208,12,20,13,159,80,159,38,55,37,80,158,38,53,89,161,37,37, -10,249,22,183,4,21,94,2,36,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,252,213, -200,201,202,203,80,158,43,53,86,94,23,194,1,28,28,248,22,71,23,197,2, +2,248,2,57,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,59,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,64,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,67,32,65,88,163,36,40,54,11,2,30,222,33,66,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,32,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,31,28,249,22,144,9,200, +2,33,198,249,22,83,28,248,22,58,201,2,4,2,34,200,199,251,2,65,196, +197,248,22,75,199,248,22,75,200,251,2,65,196,197,249,22,73,248,22,74,202, +200,248,22,75,200,251,2,65,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,33,2,27,28,249,22,138,7,194,2,32, +62,117,112,192,32,70,88,163,8,36,37,50,11,67,115,115,45,62,114,107,116, +222,33,71,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,197,2,10,248, +22,148,5,23,197,2,12,28,23,198,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,201,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,199,2,28,28,248,22,71,23,197,2,249,22,142,9,248,22,74,23, +199,2,2,4,11,248,22,139,5,248,22,98,197,28,28,248,22,71,23,197,2, 28,249,22,142,9,248,22,74,23,199,2,2,31,28,248,22,71,248,22,98,23, -198,2,249,22,142,9,248,22,102,23,199,2,2,35,11,11,11,35,251,24,198, -1,248,22,98,201,23,202,2,23,203,1,23,204,1,27,248,22,140,5,23,200, -1,28,248,22,71,193,249,2,64,248,22,74,195,249,22,87,248,22,75,197,248, -22,100,202,249,2,64,194,248,22,100,200,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,6,33,68,27,28,248,22,71,23,199,2,28,249,22,142,9,2,31, -248,22,74,23,201,2,27,248,22,98,23,200,2,28,249,22,144,9,23,195,2, -2,33,86,94,23,193,1,28,23,200,2,27,248,22,140,5,23,202,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, -202,2,192,23,198,2,23,198,2,27,28,248,22,71,23,200,2,28,249,22,142, -9,2,31,248,22,74,23,202,2,27,28,28,249,22,144,9,248,22,98,23,203, -2,2,33,23,201,2,11,27,248,22,140,5,23,203,2,28,248,22,71,23,194, -2,249,2,64,248,22,74,23,196,2,249,22,87,248,22,75,23,198,1,248,22, -100,23,206,1,249,2,64,23,195,1,248,22,100,23,204,1,249,2,64,2,33, -248,22,100,23,203,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,44,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,47,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,50,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,44,8,26,39,23, -203,2,27,248,80,159,45,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,48,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,69,23,200,1,248,22,83,248,2,70, -23,201,1,28,248,22,159,14,23,196,2,86,94,23,196,1,248,80,159,43,8, -27,39,248,22,186,14,249,22,184,14,23,199,2,248,80,159,47,8,26,39,23, -206,2,28,249,22,142,9,248,22,74,23,198,2,2,36,27,248,80,159,44,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,48,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,72,23,196,2,11,10,27,28,23,196,2,248,2,70, -23,196,2,28,248,22,81,23,195,2,2,37,28,249,22,151,15,2,72,23,197, -2,248,2,70,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,54,8,28,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,52,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,34,248,80,159,43,8,27,39,248,22,186,14,249, -22,184,14,248,22,188,14,248,22,98,23,201,2,248,80,159,47,8,26,39,23, -206,2,12,86,94,28,28,248,22,159,14,23,194,2,10,248,22,157,8,23,194, -2,86,94,23,202,1,12,28,23,202,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,205,1,86, -94,23,202,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,45,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,50, -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,53,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,55,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,213,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,56,49, -38,80,159,55,49,38,247,22,19,251,22,27,11,80,159,59,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,73,23,195,1,23,196,2,248,28,248, -22,17,80,159,57,49,38,32,0,88,163,36,37,42,11,9,222,33,74,80,159, -56,8,29,39,20,20,95,88,163,36,36,55,8,176,64,9,230,20,15,13,12, -8,7,5,2,33,75,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,36,11,249,80,159,54,47,39,28,248,22,132,7,23,208,2,249, -22,73,23,209,1,248,80,159,57,8,26,39,23,216,1,86,94,23,213,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,40, -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,21,20,15,16,2,88,163,36, -37,45,8,128,128,9,223,0,33,41,80,159,36,8,29,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,28, -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,27,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,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,53,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,54,80,159,36,46,37,20,15,16,2,88,163,8,36,38, -55,8,128,8,2,14,223,0,33,55,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,61,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,62,88,163,36,39, -49,11,9,223,0,33,63,88,163,36,40,8,33,16,2,8,176,242,8,187,241, -9,225,2,1,0,33,76,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,77,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, -78,88,163,8,36,36,45,8,240,0,0,10,2,2,24,223,0,33,79,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, 7266); +198,2,249,22,142,9,248,22,102,23,199,2,2,4,11,11,11,86,98,23,199, +1,23,198,1,23,197,1,23,194,1,23,193,1,248,22,139,5,249,2,64,248, +22,115,23,200,2,248,22,100,23,200,1,28,28,248,22,71,23,197,2,28,249, +22,142,9,248,22,74,23,199,2,2,31,28,249,22,144,9,248,22,98,23,199, +2,2,33,28,23,197,2,27,248,22,140,5,23,199,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,97,23,199, +1,23,198,1,23,194,1,23,193,1,27,248,22,140,5,23,199,1,248,22,139, +5,249,2,64,28,248,22,71,23,197,2,248,22,74,23,197,2,23,196,2,28, +248,22,71,23,197,2,249,22,87,248,22,75,23,199,1,248,22,100,23,203,1, +86,94,23,196,1,248,22,100,23,201,1,28,28,248,22,71,23,197,2,249,22, +142,9,248,22,74,23,199,2,2,35,11,86,94,23,193,1,86,94,28,208,12, +20,13,159,80,159,38,55,37,80,158,38,53,89,161,37,37,10,249,22,183,4, +21,94,2,36,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,252,213,200,201,202,203,80, +158,43,53,86,94,23,194,1,28,28,248,22,71,23,197,2,28,249,22,142,9, +248,22,74,23,199,2,2,31,28,248,22,71,248,22,98,23,198,2,249,22,142, +9,248,22,102,23,199,2,2,35,11,11,11,35,251,24,198,1,248,22,98,201, +23,202,2,23,203,1,23,204,1,27,248,22,140,5,23,200,1,28,248,22,71, +193,249,2,64,248,22,74,195,249,22,87,248,22,75,197,248,22,100,202,249,2, +64,194,248,22,100,200,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,6,33, +68,27,28,248,22,71,23,199,2,28,249,22,142,9,2,31,248,22,74,23,201, +2,27,248,22,98,23,200,2,28,249,22,144,9,23,195,2,2,33,86,94,23, +193,1,28,23,200,2,27,248,22,140,5,23,202,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,202,2,192,23,198, +2,23,198,2,27,28,248,22,71,23,200,2,28,249,22,142,9,2,31,248,22, +74,23,202,2,27,28,28,249,22,144,9,248,22,98,23,203,2,2,33,23,201, +2,11,27,248,22,140,5,23,203,2,28,248,22,71,23,194,2,249,2,64,248, +22,74,23,196,2,249,22,87,248,22,75,23,198,1,248,22,100,23,206,1,249, +2,64,23,195,1,248,22,100,23,204,1,249,2,64,2,33,248,22,100,23,203, +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,44,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,47,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,50,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,44,8,26,39,23,203,2,27,248,80, +159,45,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,48,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,69,23,200,1,248,22,83,248,2,70,23,201,1,28,248, +22,159,14,23,196,2,86,94,23,196,1,248,80,159,43,8,27,39,248,22,186, +14,249,22,184,14,23,199,2,248,80,159,47,8,26,39,23,206,2,28,249,22, +142,9,248,22,74,23,198,2,2,36,27,248,80,159,44,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,48,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,72,23,196,2,11,10,27,28,23,196,2,248,2,70,23,196,2,28,248, +22,81,23,195,2,2,37,28,249,22,151,15,2,72,23,197,2,248,2,70,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,54,8,28,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,52,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,34,248,80,159,43,8,27,39,248,22,186,14,249,22,184,14,248,22, +188,14,248,22,98,23,201,2,248,80,159,47,8,26,39,23,206,2,12,86,94, +28,28,248,22,159,14,23,194,2,10,248,22,157,8,23,194,2,86,94,23,202, +1,12,28,23,202,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,205,1,86,94,23,202,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,45,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,50,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,53,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,55,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,213,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,56,49,38,80,159,55,49, +38,247,22,19,251,22,27,11,80,159,59,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,73,23,195,1,23,196,2,248,28,248,22,17,80,159,57, +49,38,32,0,88,163,36,37,42,11,9,222,33,74,80,159,56,8,29,39,20, +20,95,88,163,36,36,55,8,176,64,9,230,20,15,13,12,8,7,5,2,33, +75,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,36, +11,249,80,159,54,47,39,28,248,22,132,7,23,208,2,249,22,73,23,209,1, +248,80,159,57,8,26,39,23,216,1,86,94,23,213,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,40,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,21,20,15,16,2,88,163,36,37,45,8,128,128, +9,223,0,33,41,80,159,36,8,29,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,28,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,27,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,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,53,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,54,80,159,36,46,37,20,15,16,2,88,163,8,36,38,55,8,128,8,2, +14,223,0,33,55,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, +61,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,62,88,163,36,39,49,11,9,223,0, +33,63,88,163,36,40,8,33,16,2,8,176,242,8,187,241,9,225,2,1,0, +33,76,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,77,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,78,88,163,8,36, +36,45,8,240,0,0,10,2,2,24,223,0,33,79,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, 7282); } { SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,9,53,46,50,46,57,48,48,46,49,84,0,0,0,0,0,0,0,0, @@ -985,7 +985,7 @@ 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, -147,79,0,0,100,159,2,3,36,36,159,2,4,36,36,159,2,5,36,36,159, +151,79,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,1,29,11,11,9,9,11,11,11,18,96,11,46,46,46,36,80,158,36, diff --git a/src/racket/src/module.c b/src/racket/src/module.c index 2381284869..1c4c83ac1c 100644 --- a/src/racket/src/module.c +++ b/src/racket/src/module.c @@ -5879,7 +5879,7 @@ static Scheme_Object *do_module_execute(Scheme_Object *data, Scheme_Env *genv, scheme_hash_set(env->module_registry->exports, m->modname, (Scheme_Object *)m->me); } - { + if (!set_in_pre) { Scheme_Object *resolver, *a[1]; resolver = scheme_get_param(config, MZCONFIG_CURRENT_MODULE_RESOLVER); a[0] = m->modname; diff --git a/src/racket/src/startup.inc b/src/racket/src/startup.inc index 913bfe486b..0fb1414cd7 100644 --- a/src/racket/src/startup.inc +++ b/src/racket/src/startup.inc @@ -747,7 +747,8 @@ " =>(lambda(zo-d)" "(parameterize((current-module-declare-source alt-path))" "(with-dir(lambda()((current-load)(car zo-d) expect-module))))))" -"(else" +"((or(not(pair? expect-module))" +"(car expect-module))" "(let((p(if try-main? path alt-path)))" "(unless(and(pair? expect-module)" "(not(file-exists? p)))" diff --git a/src/racket/src/startup.rktl b/src/racket/src/startup.rktl index 3b3e4297d1..2ea9b1168e 100644 --- a/src/racket/src/startup.rktl +++ b/src/racket/src/startup.rktl @@ -858,7 +858,8 @@ => (lambda (zo-d) (parameterize ([current-module-declare-source alt-path]) (with-dir (lambda () ((current-load) (car zo-d) expect-module)))))] - [else + [(or (not (pair? expect-module)) + (car expect-module)) (let ([p (if try-main? path alt-path)]) ;; "quiet" failure when asking for a submodule: (unless (and (pair? expect-module)