fixups for the `module-path?' change

2012-03-12 21:02:11 -06:00 · 2012-03-12 21:02:11 -06:00 · 366aa2c42d
commit 366aa2c42d
parent 542f19c00e
4 changed files with 103 additions and 97 deletions
--- a/doc/release-notes/racket/HISTORY.txt
+++ b/doc/release-notes/racket/HISTORY.txt
@ -4,6 +4,7 @@ Change resolver protocol so that declaration notify is always issued
 Change load/use-compiled handler to work with submodules
 compiler/zo-struct: added pre-submodules and post-submodules field to
 mod, changed name field to allow a list of symbols
+Changed module-path? to report #t for paths

 Version 5.2.1.7
 racket/sandbox: added sandbox-gui-enabled and sandbox-make-namespace;
--- a/src/racket/src/cstartup.inc
+++ b/src/racket/src/cstartup.inc
@ -635,7 +635,7 @@
 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,
+15,202,23,255,23,23,24,47,24,0,0,177,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,
@ -880,100 +880,101 @@
 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);
+14,28,248,22,183,14,23,198,2,23,197,2,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, 7293);
  }
  {
    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,
--- a/src/racket/src/startup.inc
+++ b/src/racket/src/startup.inc
@ -960,7 +960,9 @@
 " cols)"
 "(list(ss->rkt file))))))))"
 "((path? s) "
-"(path-ss->rkt(simplify-path(path->complete-path s(get-dir)))))"
+"(path-ss->rkt(simplify-path(if(complete-path? s)"
+" s"
+"(path->complete-path s(get-dir))))))"
 "((eq?(car s) 'lib)"
 "(or(path-cache-get(cons s(current-library-collection-paths)))"
 "(let*-values(((cols file)(split-relative-string(cadr s) #f))"
--- a/src/racket/src/startup.rktl
+++ b/src/racket/src/startup.rktl
@ -1092,7 +1092,9 @@
                                       (list (ss->rkt file)))))))]
                      [(path? s) 
                       ;; Use filesystem-sensitive `simplify-path' here:
-                       (path-ss->rkt (simplify-path (path->complete-path s (get-dir))))]
+                       (path-ss->rkt (simplify-path (if (complete-path? s)
+                                                        s
+                                                        (path->complete-path s (get-dir)))))]
                      [(eq? (car s) 'lib)
                       (or (path-cache-get (cons s (current-library-collection-paths)))
                           (let*-values ([(cols file) (split-relative-string (cadr s) #f)]