suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add `use-collection-link-paths'

Browse Source
This commit is contained in:
Matthew Flatt 2011-08-24 17:46:54 -06:00
parent 7299b0603e
commit ec29a2d85c
10 changed files with 197 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
collects/scribblings/reference/collects.scrbl
View File

@ -159,8 +159,14 @@ library collections used by @racket[require]. See
Parameter that determines whether user-specific paths, which are in Parameter that determines whether user-specific paths, which are in
the directory produced by @racket[(find-system-path 'addon-dir)], are the directory produced by @racket[(find-system-path 'addon-dir)], are
included in search paths for collections and other files. For example, included in search paths for collections and other files. For example,
@racket[find-library-collection-paths] omits the user-specific the initial value of @racket[find-library-collection-paths] omits the
collection directory when this parameter's value is @racket[#f].} user-specific collection directory when this parameter's value is
@racket[#f].}
@defboolparam[use-collection-link-paths on?]{
Parameter that determines whether @tech{collection links files} are
used to locate collections.}
@; ---------------------------------------------------------------------- @; ----------------------------------------------------------------------
@ -170,7 +176,8 @@ The @deftech{collection links files} are used by
@racket[collection-file-path], @racket[collection-path], and the @racket[collection-file-path], @racket[collection-path], and the
default @tech{module name resolver} to locate collections before default @tech{module name resolver} to locate collections before
trying the @racket[(current-library-collection-paths)] search trying the @racket[(current-library-collection-paths)] search
path. Furthermore, a user-specific @tech{collection links file} takes path, but only if the @racket[use-collection-link-paths] parameter is set to
@racket[#t]. Furthermore, a user-specific @tech{collection links file} takes
precedence over an installation-wide @tech{collection links file}, but precedence over an installation-wide @tech{collection links file}, but
the user-specific @tech{collection links file} is used only the the user-specific @tech{collection links file} is used only the
@racket[use-user-specific-search-paths] parameter is set to @racket[use-user-specific-search-paths] parameter is set to

2
src/racket/cmdline.inc
View File

@ -1327,7 +1327,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
" -X <dir>, --collects <dir> : Main collects at <dir>\n" " -X <dir>, --collects <dir> : Main collects at <dir>\n"
" -S <dir>, --search <dir> : More collects at <dir> (after main collects)\n" " -S <dir>, --search <dir> : More collects at <dir> (after main collects)\n"
" -A <dir>, --addon <dir> : Addon directory at <dir>\n" " -A <dir>, --addon <dir> : Addon directory at <dir>\n"
" -K <file>, --links <file> : Collection links at <file>\n" " -K <file>, --links <file> : User-specific collection links at <file>\n"
" -U, --no-user-path : Ignore user-specific collects, etc.\n" " -U, --no-user-path : Ignore user-specific collects, etc.\n"
" -N <file>, --name <file> : Sets `(find-system-path 'run-file)' to <file>\n" " -N <file>, --name <file> : Sets `(find-system-path 'run-file)' to <file>\n"
# ifdef MZ_USE_JIT # ifdef MZ_USE_JIT

3
src/racket/include/scheme.h
View File

@ -1244,6 +1244,7 @@ enum {
MZCONFIG_USE_COMPILED_KIND, MZCONFIG_USE_COMPILED_KIND,
MZCONFIG_USE_USER_PATHS, MZCONFIG_USE_USER_PATHS,
MZCONFIG_USE_LINK_PATHS,
MZCONFIG_LOAD_DIRECTORY, MZCONFIG_LOAD_DIRECTORY,
MZCONFIG_WRITE_DIRECTORY, MZCONFIG_WRITE_DIRECTORY,
@ -1732,6 +1733,7 @@ MZ_EXTERN int scheme_hash_percent_globals_only; /* Defaults to 0 */
MZ_EXTERN int scheme_binary_mode_stdio; /* Windows-specific; Defaults to 0 */ MZ_EXTERN int scheme_binary_mode_stdio; /* Windows-specific; Defaults to 0 */
MZ_EXTERN int scheme_startup_use_jit; /* Defaults to 1 */ MZ_EXTERN int scheme_startup_use_jit; /* Defaults to 1 */
MZ_EXTERN int scheme_ignore_user_paths; /* Defaults to 0 */ MZ_EXTERN int scheme_ignore_user_paths; /* Defaults to 0 */
MZ_EXTERN int scheme_ignore_link_paths; /* Defaults to 0 */
MZ_EXTERN void scheme_set_case_sensitive(int); MZ_EXTERN void scheme_set_case_sensitive(int);
MZ_EXTERN void scheme_set_allow_set_undefined(int); MZ_EXTERN void scheme_set_allow_set_undefined(int);
@ -1739,6 +1741,7 @@ MZ_EXTERN void scheme_set_binary_mode_stdio(int);
MZ_EXTERN void scheme_set_startup_use_jit(int); MZ_EXTERN void scheme_set_startup_use_jit(int);
MZ_EXTERN void scheme_set_startup_load_on_demand(int); MZ_EXTERN void scheme_set_startup_load_on_demand(int);
MZ_EXTERN void scheme_set_ignore_user_paths(int); MZ_EXTERN void scheme_set_ignore_user_paths(int);
MZ_EXTERN void scheme_set_ignore_link_paths(int);
MZ_EXTERN void scheme_set_logging(int syslog_level, int stderr_level); MZ_EXTERN void scheme_set_logging(int syslog_level, int stderr_level);
MZ_EXTERN int scheme_get_allow_set_undefined(); MZ_EXTERN int scheme_get_allow_set_undefined();

307
src/racket/src/cstartup.inc
View File

@ -1,5 +1,5 @@
{ {
SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,53,0,0,0,0,0,0,0,0,0,0,0, SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,54,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,51,0,0,0,1,0,0,10,0,13,0,22, 0,0,0,0,0,0,0,0,0,51,0,0,0,1,0,0,10,0,13,0,22,
0,26,0,31,0,38,0,51,0,58,0,63,0,68,0,72,0,79,0,82,0, 0,26,0,31,0,38,0,51,0,58,0,63,0,68,0,72,0,79,0,82,0,
85,0,91,0,105,0,119,0,122,0,128,0,132,0,134,0,145,0,147,0,161, 85,0,91,0,105,0,119,0,122,0,128,0,132,0,134,0,145,0,147,0,161,
@ -15,12 +15,12 @@
116,120,61,115,70,108,101,116,45,118,97,108,117,101,115,61,120,73,108,101,116, 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,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, 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,122,76,0, 100,101,102,105,110,101,45,118,97,108,117,101,115,97,36,11,8,240,126,76,0,
0,95,159,2,17,36,36,159,2,16,36,36,159,2,16,36,36,16,20,2,4, 0,95,159,2,17,36,36,159,2,16,36,36,159,2,16,36,36,16,20,2,4,
2,2,2,6,2,2,2,8,2,2,2,7,2,2,2,9,2,2,2,10,2, 2,2,2,6,2,2,2,8,2,2,2,7,2,2,2,9,2,2,2,10,2,
2,2,11,2,2,2,5,2,2,2,12,2,2,2,13,2,2,97,37,11,8, 2,2,11,2,2,2,5,2,2,2,12,2,2,2,13,2,2,97,37,11,8,
240,122,76,0,0,93,159,2,16,36,37,16,2,2,3,161,2,2,37,2,3, 240,126,76,0,0,93,159,2,16,36,37,16,2,2,3,161,2,2,37,2,3,
2,2,2,3,96,11,11,8,240,122,76,0,0,16,0,96,38,11,8,240,122, 2,2,2,3,96,11,11,8,240,126,76,0,0,16,0,96,38,11,8,240,126,
76,0,0,16,0,18,98,64,104,101,114,101,13,16,5,36,2,14,2,2,11, 76,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,155,4,195,249,22,148,4,80,158, 11,8,32,8,31,8,30,8,29,27,248,22,155,4,195,249,22,148,4,80,158,
39,36,251,22,83,2,18,248,22,98,199,12,249,22,73,2,19,248,22,100,201, 39,36,251,22,83,2,18,248,22,98,199,12,249,22,73,2,19,248,22,100,201,
@ -98,7 +98,7 @@
EVAL_ONE_SIZED_STR((char *)expr, 2004); EVAL_ONE_SIZED_STR((char *)expr, 2004);
} }
{ {
SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,53,0,0,0,0,0,0,0,0,0,0,0, SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,54,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,109,0,0,0,1,0,0,8,0,21,0,26, 0,0,0,0,0,0,0,0,0,109,0,0,0,1,0,0,8,0,21,0,26,
0,43,0,65,0,94,0,109,0,127,0,143,0,157,0,179,0,195,0,212,0, 0,43,0,65,0,94,0,109,0,127,0,143,0,157,0,179,0,195,0,212,0,
234,0,245,0,251,0,4,1,11,1,18,1,30,1,46,1,70,1,102,1,120, 234,0,245,0,251,0,4,1,11,1,18,1,30,1,46,1,70,1,102,1,120,
@ -109,8 +109,8 @@
12,146,13,248,13,78,14,164,14,8,15,92,15,106,15,220,15,48,16,62,16, 12,146,13,248,13,78,14,164,14,8,15,92,15,106,15,220,15,48,16,62,16,
15,17,23,17,129,17,192,17,194,17,50,18,110,18,115,18,238,18,249,18,129, 15,17,23,17,129,17,192,17,194,17,50,18,110,18,115,18,238,18,249,18,129,
19,139,19,62,21,84,21,93,21,86,22,104,22,118,22,77,23,96,23,34,26, 19,139,19,62,21,84,21,93,21,86,22,104,22,118,22,77,23,96,23,34,26,
154,30,52,31,197,31,182,32,164,33,171,33,252,33,79,34,164,34,190,34,63, 154,30,68,31,213,31,198,32,180,33,187,33,12,34,95,34,180,34,206,34,79,
35,0,0,163,39,0,0,67,35,37,117,116,105,108,115,72,112,97,116,104,45, 35,0,0,180,39,0,0,67,35,37,117,116,105,108,115,72,112,97,116,104,45,
115,116,114,105,110,103,63,64,98,115,98,115,76,110,111,114,109,97,108,45,99, 115,116,114,105,110,103,63,64,98,115,98,115,76,110,111,114,109,97,108,45,99,
97,115,101,45,112,97,116,104,1,20,102,105,110,100,45,101,120,101,99,117,116, 97,115,101,45,112,97,116,104,1,20,102,105,110,100,45,101,120,101,99,117,116,
97,98,108,101,45,112,97,116,104,1,27,112,97,116,104,45,108,105,115,116,45, 97,98,108,101,45,112,97,116,104,1,27,112,97,116,104,45,108,105,115,116,45,
@ -194,12 +194,12 @@
32,115,116,114,105,110,103,23,197,2,28,28,248,22,149,14,23,195,2,249,22, 32,115,116,114,105,110,103,23,197,2,28,28,248,22,149,14,23,195,2,249,22,
140,9,248,22,150,14,23,197,2,2,32,249,22,140,9,247,22,152,8,2,32, 140,9,248,22,150,14,23,197,2,2,32,249,22,140,9,247,22,152,8,2,32,
27,28,248,22,130,7,23,196,2,23,195,2,248,22,142,8,248,22,153,14,23, 27,28,248,22,130,7,23,196,2,23,195,2,248,22,142,8,248,22,153,14,23,
197,2,28,249,22,139,15,0,21,35,114,120,34,94,91,92,92,93,91,92,92, 197,2,28,249,22,140,15,0,21,35,114,120,34,94,91,92,92,93,91,92,92,
93,91,63,93,91,92,92,93,34,23,195,2,28,248,22,130,7,195,248,22,156, 93,91,63,93,91,92,92,93,34,23,195,2,28,248,22,130,7,195,248,22,156,
14,195,194,27,248,22,169,7,23,195,1,249,22,157,14,248,22,145,8,250,22, 14,195,194,27,248,22,169,7,23,195,1,249,22,157,14,248,22,145,8,250,22,
147,15,0,6,35,114,120,34,47,34,28,249,22,139,15,0,22,35,114,120,34, 148,15,0,6,35,114,120,34,47,34,28,249,22,140,15,0,22,35,114,120,34,
91,47,92,92,93,91,46,32,93,43,91,47,92,92,93,42,36,34,23,201,2, 91,47,92,92,93,91,46,32,93,43,91,47,92,92,93,42,36,34,23,201,2,
23,199,1,250,22,147,15,0,19,35,114,120,34,91,32,46,93,43,40,91,47, 23,199,1,250,22,148,15,0,19,35,114,120,34,91,32,46,93,43,40,91,47,
92,92,93,42,41,36,34,23,202,1,6,2,2,92,49,80,159,44,37,38,2, 92,92,93,42,41,36,34,23,202,1,6,2,2,92,49,80,159,44,37,38,2,
32,28,248,22,130,7,194,248,22,156,14,194,193,32,56,88,163,8,36,39,53, 32,28,248,22,130,7,194,248,22,156,14,194,193,32,56,88,163,8,36,39,53,
11,70,102,111,117,110,100,45,101,120,101,99,222,33,59,32,57,88,163,8,36, 11,70,102,111,117,110,100,45,101,120,101,99,222,33,59,32,57,88,163,8,36,
@ -261,21 +261,21 @@
251,2,60,23,15,23,16,23,17,248,22,75,199,27,248,22,173,14,23,196,1, 251,2,60,23,15,23,16,23,17,248,22,75,199,27,248,22,173,14,23,196,1,
28,248,22,160,14,193,250,2,56,198,199,195,11,250,80,159,39,39,39,196,197, 28,248,22,160,14,193,250,2,56,198,199,195,11,250,80,159,39,39,39,196,197,
11,250,80,159,39,39,39,196,11,11,32,65,88,163,8,36,39,57,11,2,30, 11,250,80,159,39,39,39,196,11,11,32,65,88,163,8,36,39,57,11,2,30,
222,33,67,0,8,35,114,120,35,34,92,34,34,27,249,22,135,15,23,197,2, 222,33,67,0,8,35,114,120,35,34,92,34,34,27,249,22,136,15,23,197,2,
23,198,2,28,23,193,2,86,94,23,196,1,27,248,22,98,23,195,2,27,27, 23,198,2,28,23,193,2,86,94,23,196,1,27,248,22,98,23,195,2,27,27,
248,22,107,23,197,1,27,249,22,135,15,23,201,2,23,196,2,28,23,193,2, 248,22,107,23,197,1,27,249,22,136,15,23,201,2,23,196,2,28,23,193,2,
86,94,23,194,1,27,248,22,98,23,195,2,27,250,2,65,23,203,2,23,204, 86,94,23,194,1,27,248,22,98,23,195,2,27,250,2,65,23,203,2,23,204,
1,248,22,107,23,199,1,28,249,22,191,7,23,196,2,2,34,249,22,87,23, 1,248,22,107,23,199,1,28,249,22,191,7,23,196,2,2,34,249,22,87,23,
202,2,194,249,22,73,248,22,157,14,28,249,22,140,9,247,22,152,8,2,32, 202,2,194,249,22,73,248,22,157,14,28,249,22,140,9,247,22,152,8,2,32,
250,22,147,15,2,66,23,200,1,2,35,23,197,1,194,86,95,23,199,1,23, 250,22,148,15,2,66,23,200,1,2,35,23,197,1,194,86,95,23,199,1,23,
193,1,28,249,22,191,7,23,196,2,2,34,249,22,87,23,200,2,9,249,22, 193,1,28,249,22,191,7,23,196,2,2,34,249,22,87,23,200,2,9,249,22,
73,248,22,157,14,28,249,22,140,9,247,22,152,8,2,32,250,22,147,15,2, 73,248,22,157,14,28,249,22,140,9,247,22,152,8,2,32,250,22,148,15,2,
66,23,200,1,2,35,23,197,1,9,28,249,22,191,7,23,196,2,2,34,249, 66,23,200,1,2,35,23,197,1,9,28,249,22,191,7,23,196,2,2,34,249,
22,87,197,194,86,94,23,196,1,249,22,73,248,22,157,14,28,249,22,140,9, 22,87,197,194,86,94,23,196,1,249,22,73,248,22,157,14,28,249,22,140,9,
247,22,152,8,2,32,250,22,147,15,2,66,23,200,1,2,35,23,197,1,194, 247,22,152,8,2,32,250,22,148,15,2,66,23,200,1,2,35,23,197,1,194,
86,94,23,193,1,28,249,22,191,7,23,198,2,2,34,249,22,87,195,9,86, 86,94,23,193,1,28,249,22,191,7,23,198,2,2,34,249,22,87,195,9,86,
94,23,194,1,249,22,73,248,22,157,14,28,249,22,140,9,247,22,152,8,2, 94,23,194,1,249,22,73,248,22,157,14,28,249,22,140,9,247,22,152,8,2,
32,250,22,147,15,2,66,23,202,1,2,35,23,199,1,9,86,95,28,28,248, 32,250,22,148,15,2,66,23,202,1,2,35,23,199,1,9,86,95,28,28,248,
22,183,7,194,10,248,22,130,7,194,12,250,22,176,9,2,6,6,21,21,98, 22,183,7,194,10,248,22,130,7,194,12,250,22,176,9,2,6,6,21,21,98,
121,116,101,32,115,116,114,105,110,103,32,111,114,32,115,116,114,105,110,103,196, 121,116,101,32,115,116,114,105,110,103,32,111,114,32,115,116,114,105,110,103,196,
28,28,248,22,82,195,249,22,4,22,148,14,196,11,12,250,22,176,9,2,6, 28,28,248,22,82,195,249,22,4,22,148,14,196,11,12,250,22,176,9,2,6,
@ -340,9 +340,9 @@
7,248,22,74,23,195,2,10,249,22,140,9,64,114,111,111,116,248,22,74,23, 7,248,22,74,23,195,2,10,249,22,140,9,64,114,111,111,116,248,22,74,23,
196,2,28,27,248,22,98,194,28,248,22,148,14,23,194,2,10,28,248,22,130, 196,2,28,27,248,22,98,194,28,248,22,148,14,23,194,2,10,28,248,22,130,
7,23,194,2,28,248,22,170,14,23,194,2,10,248,22,171,14,23,194,1,11, 7,23,194,2,28,248,22,170,14,23,194,2,10,248,22,171,14,23,194,1,11,
27,248,22,81,248,22,100,195,28,192,192,248,22,148,15,248,22,107,195,11,11, 27,248,22,81,248,22,100,195,28,192,192,248,22,149,15,248,22,107,195,11,11,
11,11,250,22,151,2,196,197,249,22,73,197,200,28,28,248,22,81,248,22,100, 11,11,250,22,151,2,196,197,249,22,73,197,200,28,28,248,22,81,248,22,100,
23,197,2,10,249,22,139,15,248,22,107,23,198,2,247,22,148,8,27,248,22, 23,197,2,10,249,22,140,15,248,22,107,23,198,2,247,22,148,8,27,248,22,
175,14,249,22,173,14,248,22,98,23,200,2,23,198,1,28,248,22,58,248,22, 175,14,249,22,173,14,248,22,98,23,200,2,23,198,1,28,248,22,58,248,22,
74,23,198,2,86,94,23,196,1,86,94,28,250,22,153,2,196,11,11,12,250, 74,23,198,2,86,94,23,196,1,86,94,28,250,22,153,2,196,11,11,12,250,
22,151,2,196,11,9,249,22,157,2,195,88,163,8,36,38,50,11,9,224,3, 22,151,2,196,11,9,249,22,157,2,195,88,163,8,36,38,50,11,9,224,3,
@ -371,13 +371,13 @@
159,11,80,158,42,53,193,20,18,159,11,80,158,42,54,196,193,28,193,80,158, 159,11,80,158,42,53,193,20,18,159,11,80,158,42,54,196,193,28,193,80,158,
38,47,80,158,38,53,248,22,8,88,163,8,32,37,8,40,8,240,0,188,23, 38,47,80,158,38,53,248,22,8,88,163,8,32,37,8,40,8,240,0,188,23,
0,9,224,1,2,33,89,0,7,35,114,120,34,47,43,34,28,248,22,130,7, 0,9,224,1,2,33,89,0,7,35,114,120,34,47,43,34,28,248,22,130,7,
23,195,2,27,249,22,137,15,2,91,196,28,192,28,249,22,184,3,248,22,97, 23,195,2,27,249,22,138,15,2,91,196,28,192,28,249,22,184,3,248,22,97,
195,248,22,174,3,248,22,133,7,198,249,22,7,250,22,152,7,199,36,248,22, 195,248,22,174,3,248,22,133,7,198,249,22,7,250,22,152,7,199,36,248,22,
97,198,197,249,22,7,250,22,152,7,199,36,248,22,97,198,249,22,73,249,22, 97,198,197,249,22,7,250,22,152,7,199,36,248,22,97,198,249,22,73,249,22,
152,7,200,248,22,99,199,199,249,22,7,196,197,90,159,39,11,89,161,39,36, 152,7,200,248,22,99,199,199,249,22,7,196,197,90,159,39,11,89,161,39,36,
11,248,22,169,14,23,198,1,86,94,23,195,1,28,249,22,140,9,23,195,2, 11,248,22,169,14,23,198,1,86,94,23,195,1,28,249,22,140,9,23,195,2,
2,33,249,22,7,195,199,27,249,22,73,23,197,1,23,201,1,28,248,22,130, 2,33,249,22,7,195,199,27,249,22,73,23,197,1,23,201,1,28,248,22,130,
7,23,195,2,27,249,22,137,15,2,91,196,28,192,28,249,22,184,3,248,22, 7,23,195,2,27,249,22,138,15,2,91,196,28,192,28,249,22,184,3,248,22,
97,195,248,22,174,3,248,22,133,7,198,249,22,7,250,22,152,7,199,36,248, 97,195,248,22,174,3,248,22,133,7,198,249,22,7,250,22,152,7,199,36,248,
22,97,198,195,249,22,7,250,22,152,7,199,36,248,22,97,198,249,22,73,249, 22,97,198,195,249,22,7,250,22,152,7,199,36,248,22,97,198,249,22,73,249,
22,152,7,200,248,22,99,199,197,249,22,7,196,195,90,159,39,11,89,161,39, 22,152,7,200,248,22,99,199,197,249,22,7,196,195,90,159,39,11,89,161,39,
@ -485,119 +485,120 @@
23,15,23,16,248,22,75,23,18,23,18,26,8,2,93,202,203,204,205,206,23, 23,15,23,16,248,22,75,23,18,23,18,26,8,2,93,202,203,204,205,206,23,
15,248,22,75,23,17,23,17,90,159,38,11,89,161,38,36,11,249,80,159,40, 15,248,22,75,23,17,23,17,90,159,38,11,89,161,38,36,11,249,80,159,40,
57,39,23,200,1,23,201,1,27,248,22,61,28,248,22,148,14,195,248,22,152, 57,39,23,200,1,23,201,1,27,248,22,61,28,248,22,148,14,195,248,22,152,
14,195,194,27,250,22,87,28,247,22,128,15,27,248,80,159,45,55,39,10,27, 14,195,194,27,247,22,129,15,27,250,22,87,28,23,197,2,28,247,22,128,15,
250,22,153,2,23,197,2,23,202,2,11,28,23,193,2,192,86,94,23,193,1, 27,248,80,159,46,55,39,10,27,250,22,153,2,23,197,2,23,203,2,11,28,
250,22,153,2,23,197,1,11,9,9,28,80,159,43,49,38,27,248,80,159,45, 23,193,2,192,86,94,23,193,1,250,22,153,2,23,197,1,11,9,9,9,28,
55,39,11,27,250,22,153,2,23,197,2,23,202,1,11,28,23,193,2,192,86, 23,197,1,28,80,159,44,49,38,27,248,80,159,46,55,39,11,27,250,22,153,
94,23,193,1,250,22,153,2,23,197,1,11,9,86,94,23,197,1,9,247,22, 2,23,197,2,23,203,1,11,28,23,193,2,192,86,94,23,193,1,250,22,153,
190,14,26,8,2,93,200,202,203,205,206,23,17,200,11,86,95,28,28,248,22, 2,23,197,1,11,9,86,94,23,198,1,9,9,247,22,190,14,26,8,2,93,
149,14,23,194,2,10,28,248,22,148,14,23,194,2,10,28,248,22,130,7,23, 200,203,204,206,23,15,23,18,200,11,86,95,28,28,248,22,149,14,23,194,2,
194,2,28,248,22,170,14,23,194,2,10,248,22,171,14,23,194,2,11,12,252, 10,28,248,22,148,14,23,194,2,10,28,248,22,130,7,23,194,2,28,248,22,
22,176,9,23,200,2,2,42,36,23,198,2,23,199,2,28,28,248,22,130,7, 170,14,23,194,2,10,248,22,171,14,23,194,2,11,12,252,22,176,9,23,200,
23,195,2,10,248,22,183,7,23,195,2,86,94,23,194,1,12,252,22,176,9, 2,2,42,36,23,198,2,23,199,2,28,28,248,22,130,7,23,195,2,10,248,
23,200,2,2,43,37,23,198,2,23,199,1,90,159,39,11,89,161,39,36,11, 22,183,7,23,195,2,86,94,23,194,1,12,252,22,176,9,23,200,2,2,43,
248,22,169,14,23,197,2,86,94,23,195,1,86,94,28,192,12,250,22,177,9, 37,23,198,2,23,199,1,90,159,39,11,89,161,39,36,11,248,22,169,14,23,
23,201,1,2,44,23,199,1,249,22,7,194,195,90,159,38,11,89,161,38,36, 197,2,86,94,23,195,1,86,94,28,192,12,250,22,177,9,23,201,1,2,44,
11,86,95,28,28,248,22,149,14,23,196,2,10,28,248,22,148,14,23,196,2, 23,199,1,249,22,7,194,195,90,159,38,11,89,161,38,36,11,86,95,28,28,
10,28,248,22,130,7,23,196,2,28,248,22,170,14,23,196,2,10,248,22,171, 248,22,149,14,23,196,2,10,28,248,22,148,14,23,196,2,10,28,248,22,130,
14,23,196,2,11,12,252,22,176,9,2,25,2,42,36,23,200,2,23,201,2, 7,23,196,2,28,248,22,170,14,23,196,2,10,248,22,171,14,23,196,2,11,
28,28,248,22,130,7,23,197,2,10,248,22,183,7,23,197,2,12,252,22,176, 12,252,22,176,9,2,25,2,42,36,23,200,2,23,201,2,28,28,248,22,130,
9,2,25,2,43,37,23,200,2,23,201,2,90,159,39,11,89,161,39,36,11, 7,23,197,2,10,248,22,183,7,23,197,2,12,252,22,176,9,2,25,2,43,
248,22,169,14,23,199,2,86,94,23,195,1,86,94,28,192,12,250,22,177,9, 37,23,200,2,23,201,2,90,159,39,11,89,161,39,36,11,248,22,169,14,23,
2,25,2,44,23,201,2,249,22,7,194,195,27,249,22,158,14,250,22,146,15, 199,2,86,94,23,195,1,86,94,28,192,12,250,22,177,9,2,25,2,44,23,
0,20,35,114,120,35,34,40,63,58,91,46,93,91,94,46,93,42,124,41,36, 201,2,249,22,7,194,195,27,249,22,158,14,250,22,147,15,0,20,35,114,120,
34,248,22,154,14,23,201,1,28,248,22,130,7,23,203,2,249,22,145,8,23, 35,34,40,63,58,91,46,93,91,94,46,93,42,124,41,36,34,248,22,154,14,
204,1,8,63,23,202,1,28,248,22,149,14,23,199,2,248,22,150,14,23,199, 23,201,1,28,248,22,130,7,23,203,2,249,22,145,8,23,204,1,8,63,23,
1,86,94,23,198,1,247,22,151,14,28,248,22,148,14,194,249,22,166,14,195, 202,1,28,248,22,149,14,23,199,2,248,22,150,14,23,199,1,86,94,23,198,
194,192,90,159,38,11,89,161,38,36,11,86,95,28,28,248,22,149,14,23,196, 1,247,22,151,14,28,248,22,148,14,194,249,22,166,14,195,194,192,90,159,38,
2,10,28,248,22,148,14,23,196,2,10,28,248,22,130,7,23,196,2,28,248, 11,89,161,38,36,11,86,95,28,28,248,22,149,14,23,196,2,10,28,248,22,
22,170,14,23,196,2,10,248,22,171,14,23,196,2,11,12,252,22,176,9,2, 148,14,23,196,2,10,28,248,22,130,7,23,196,2,28,248,22,170,14,23,196,
26,2,42,36,23,200,2,23,201,2,28,28,248,22,130,7,23,197,2,10,248, 2,10,248,22,171,14,23,196,2,11,12,252,22,176,9,2,26,2,42,36,23,
22,183,7,23,197,2,12,252,22,176,9,2,26,2,43,37,23,200,2,23,201, 200,2,23,201,2,28,28,248,22,130,7,23,197,2,10,248,22,183,7,23,197,
2,90,159,39,11,89,161,39,36,11,248,22,169,14,23,199,2,86,94,23,195, 2,12,252,22,176,9,2,26,2,43,37,23,200,2,23,201,2,90,159,39,11,
1,86,94,28,192,12,250,22,177,9,2,26,2,44,23,201,2,249,22,7,194, 89,161,39,36,11,248,22,169,14,23,199,2,86,94,23,195,1,86,94,28,192,
195,27,249,22,158,14,249,22,131,8,250,22,147,15,0,9,35,114,120,35,34, 12,250,22,177,9,2,26,2,44,23,201,2,249,22,7,194,195,27,249,22,158,
91,46,93,34,248,22,154,14,23,203,1,6,1,1,95,28,248,22,130,7,23, 14,249,22,131,8,250,22,148,15,0,9,35,114,120,35,34,91,46,93,34,248,
202,2,249,22,145,8,23,203,1,8,63,23,201,1,28,248,22,149,14,23,199, 22,154,14,23,203,1,6,1,1,95,28,248,22,130,7,23,202,2,249,22,145,
2,248,22,150,14,23,199,1,86,94,23,198,1,247,22,151,14,28,248,22,148, 8,23,203,1,8,63,23,201,1,28,248,22,149,14,23,199,2,248,22,150,14,
14,194,249,22,166,14,195,194,192,249,247,22,158,5,194,11,27,247,22,128,15, 23,199,1,86,94,23,198,1,247,22,151,14,28,248,22,148,14,194,249,22,166,
249,80,159,39,40,38,28,23,195,2,27,248,22,150,8,2,45,28,192,192,2, 14,195,194,192,249,247,22,158,5,194,11,27,247,22,128,15,249,80,159,39,40,
46,2,47,27,28,23,196,1,250,22,166,14,248,22,188,14,2,48,247,22,148, 38,28,23,195,2,27,248,22,150,8,2,45,28,192,192,2,46,2,47,27,28,
8,2,49,11,27,248,80,159,42,8,28,39,250,22,87,9,248,22,83,248,22, 23,196,1,250,22,166,14,248,22,188,14,2,48,247,22,148,8,2,49,11,27,
188,14,2,38,9,28,193,249,22,73,195,194,192,27,247,22,128,15,249,80,159, 248,80,159,42,8,28,39,250,22,87,9,248,22,83,248,22,188,14,2,38,9,
39,40,38,28,23,195,2,27,248,22,150,8,2,45,28,192,192,2,46,2,47, 28,193,249,22,73,195,194,192,27,247,22,128,15,249,80,159,39,40,38,28,23,
27,28,23,196,1,250,22,166,14,248,22,188,14,2,48,247,22,148,8,2,49, 195,2,27,248,22,150,8,2,45,28,192,192,2,46,2,47,27,28,23,196,1,
11,27,248,80,159,42,8,29,39,250,22,87,23,203,1,248,22,83,248,22,188, 250,22,166,14,248,22,188,14,2,48,247,22,148,8,2,49,11,27,248,80,159,
14,2,38,9,28,193,249,22,73,195,194,192,27,247,22,128,15,249,80,159,39, 42,8,29,39,250,22,87,23,203,1,248,22,83,248,22,188,14,2,38,9,28,
40,38,28,23,195,2,27,248,22,150,8,2,45,28,192,192,2,46,2,47,27, 193,249,22,73,195,194,192,27,247,22,128,15,249,80,159,39,40,38,28,23,195,
28,23,196,1,250,22,166,14,248,22,188,14,2,48,247,22,148,8,2,49,11, 2,27,248,22,150,8,2,45,28,192,192,2,46,2,47,27,28,23,196,1,250,
27,248,80,159,42,8,30,39,250,22,87,23,203,1,248,22,83,248,22,188,14, 22,166,14,248,22,188,14,2,48,247,22,148,8,2,49,11,27,248,80,159,42,
2,38,23,204,1,28,193,249,22,73,195,194,192,86,94,249,22,183,6,247,22, 8,30,39,250,22,87,23,203,1,248,22,83,248,22,188,14,2,38,23,204,1,
154,5,195,248,22,145,6,249,22,128,4,36,249,22,176,3,197,198,27,28,23, 28,193,249,22,73,195,194,192,86,94,249,22,183,6,247,22,154,5,195,248,22,
197,2,86,95,23,196,1,23,195,1,23,197,1,86,94,23,197,1,27,248,22, 145,6,249,22,128,4,36,249,22,176,3,197,198,27,28,23,197,2,86,95,23,
188,14,2,31,27,250,80,159,42,39,39,23,197,1,11,11,27,248,22,131,4, 196,1,23,195,1,23,197,1,86,94,23,197,1,27,248,22,188,14,2,31,27,
23,199,1,27,28,23,194,2,23,194,1,86,94,23,194,1,36,27,248,22,131, 250,80,159,42,39,39,23,197,1,11,11,27,248,22,131,4,23,199,1,27,28,
4,23,202,1,27,28,23,194,2,23,194,1,86,94,23,194,1,36,249,22,185, 23,194,2,23,194,1,86,94,23,194,1,36,27,248,22,131,4,23,202,1,27,
5,23,199,1,20,20,95,88,163,8,36,36,48,11,9,224,4,2,33,107,23, 28,23,194,2,23,194,1,86,94,23,194,1,36,249,22,185,5,23,199,1,20,
195,1,23,197,1,27,248,22,170,5,23,195,1,248,80,159,39,8,31,39,193, 20,95,88,163,8,36,36,48,11,9,224,4,2,33,107,23,195,1,23,197,1,
159,36,20,112,159,36,16,1,11,16,0,20,26,142,2,1,2,1,29,11,11, 27,248,22,170,5,23,195,1,248,80,159,39,8,31,39,193,159,36,20,112,159,
11,11,11,10,43,80,158,36,36,20,112,159,40,16,28,2,2,2,3,2,4, 36,16,1,11,16,0,20,26,142,2,1,2,1,29,11,11,11,11,11,10,43,
2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,12,2,13,2,14,2, 80,158,36,36,20,112,159,40,16,28,2,2,2,3,2,4,2,5,2,6,2,
15,30,2,18,76,102,105,110,100,45,108,105,110,107,115,45,112,97,116,104,33, 7,2,8,2,9,2,10,2,11,2,12,2,13,2,14,2,15,30,2,18,76,
4,30,2,19,1,20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111, 102,105,110,100,45,108,105,110,107,115,45,112,97,116,104,33,4,30,2,19,1,
110,45,107,101,121,6,30,2,19,1,23,101,120,116,101,110,100,45,112,97,114, 20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,45,107,101,121,
97,109,101,116,101,114,105,122,97,116,105,111,110,3,2,20,2,21,2,22,30, 6,30,2,19,1,23,101,120,116,101,110,100,45,112,97,114,97,109,101,116,101,
2,18,1,21,101,120,99,101,112,116,105,111,110,45,104,97,110,100,108,101,114, 114,105,122,97,116,105,111,110,3,2,20,2,21,2,22,30,2,18,1,21,101,
45,107,101,121,2,2,23,2,24,2,25,2,26,2,27,2,28,2,29,16,0, 120,99,101,112,116,105,111,110,45,104,97,110,100,108,101,114,45,107,101,121,2,
16,0,36,16,0,36,16,12,2,8,2,7,2,3,2,24,2,22,2,20,2, 2,23,2,24,2,25,2,26,2,27,2,28,2,29,16,0,16,0,36,16,0,
15,2,21,2,23,2,13,2,12,2,14,48,11,11,39,36,11,11,16,12,2, 36,16,12,2,8,2,7,2,3,2,24,2,22,2,20,2,15,2,21,2,23,
11,2,9,2,29,2,10,2,5,2,28,2,27,2,4,2,26,2,6,2,25, 2,13,2,12,2,14,48,11,11,39,36,11,11,16,12,2,11,2,9,2,29,
2,2,16,12,11,11,11,11,11,11,11,11,11,11,11,11,16,12,2,11,2, 2,10,2,5,2,28,2,27,2,4,2,26,2,6,2,25,2,2,16,12,11,
9,2,29,2,10,2,5,2,28,2,27,2,4,2,26,2,6,2,25,2,2, 11,11,11,11,11,11,11,11,11,11,11,16,12,2,11,2,9,2,29,2,10,
48,48,37,11,11,16,0,16,0,16,0,36,36,11,11,11,16,0,16,0,16, 2,5,2,28,2,27,2,4,2,26,2,6,2,25,2,2,48,48,37,11,11,
0,36,36,16,0,16,28,20,15,16,2,88,163,8,36,37,51,16,2,8,240, 16,0,16,0,16,0,36,36,11,11,11,16,0,16,0,16,0,36,36,16,0,
0,128,0,0,8,240,1,128,0,0,2,30,223,0,33,50,80,159,36,8,31, 16,28,20,15,16,2,88,163,8,36,37,51,16,2,8,240,0,128,0,0,8,
39,20,15,16,2,88,163,8,36,37,56,16,2,44,8,240,0,64,0,0,2, 240,1,128,0,0,2,30,223,0,33,50,80,159,36,8,31,39,20,15,16,2,
30,223,0,33,51,80,159,36,8,30,39,20,15,16,2,88,163,8,36,37,51, 88,163,8,36,37,56,16,2,44,8,240,0,64,0,0,2,30,223,0,33,51,
16,2,44,8,128,128,2,30,223,0,33,52,80,159,36,8,29,39,20,15,16, 80,159,36,8,30,39,20,15,16,2,88,163,8,36,37,51,16,2,44,8,128,
2,88,163,8,36,37,51,16,2,44,8,128,64,2,30,223,0,33,53,80,159, 128,2,30,223,0,33,52,80,159,36,8,29,39,20,15,16,2,88,163,8,36,
36,8,28,39,20,15,16,2,32,0,88,163,36,37,45,11,2,2,222,33,54, 37,51,16,2,44,8,128,64,2,30,223,0,33,53,80,159,36,8,28,39,20,
80,159,36,36,37,20,15,16,2,249,22,132,7,7,92,7,92,80,159,36,37, 15,16,2,32,0,88,163,36,37,45,11,2,2,222,33,54,80,159,36,36,37,
37,20,15,16,2,88,163,36,37,54,38,2,4,223,0,33,55,80,159,36,38, 20,15,16,2,249,22,132,7,7,92,7,92,80,159,36,37,37,20,15,16,2,
37,20,15,16,2,20,25,96,2,5,88,163,8,36,39,8,24,52,9,223,0, 88,163,36,37,54,38,2,4,223,0,33,55,80,159,36,38,37,20,15,16,2,
33,62,88,163,36,38,47,44,9,223,0,33,63,88,163,36,37,46,44,9,223, 20,25,96,2,5,88,163,8,36,39,8,24,52,9,223,0,33,62,88,163,36,
0,33,64,80,159,36,39,37,20,15,16,2,27,248,22,131,15,248,22,144,8, 38,47,44,9,223,0,33,63,88,163,36,37,46,44,9,223,0,33,64,80,159,
27,28,249,22,140,9,247,22,152,8,2,32,6,1,1,59,6,1,1,58,250, 36,39,37,20,15,16,2,27,248,22,132,15,248,22,144,8,27,28,249,22,140,
22,178,7,6,14,14,40,91,94,126,97,93,42,41,126,97,40,46,42,41,23, 9,247,22,152,8,2,32,6,1,1,59,6,1,1,58,250,22,178,7,6,14,
196,2,23,196,1,88,163,8,36,38,48,11,2,6,223,0,33,68,80,159,36, 14,40,91,94,126,97,93,42,41,126,97,40,46,42,41,23,196,2,23,196,1,
40,37,20,15,16,2,32,0,88,163,8,36,38,50,11,2,7,222,33,69,80, 88,163,8,36,38,48,11,2,6,223,0,33,68,80,159,36,40,37,20,15,16,
159,36,41,37,20,15,16,2,32,0,88,163,8,36,39,51,11,2,8,222,33, 2,32,0,88,163,8,36,38,50,11,2,7,222,33,69,80,159,36,41,37,20,
71,80,159,36,42,37,20,15,16,2,88,163,45,38,51,8,128,4,2,9,223, 15,16,2,32,0,88,163,8,36,39,51,11,2,8,222,33,71,80,159,36,42,
0,33,74,80,159,36,43,37,20,15,16,2,88,163,45,39,52,8,128,4,2, 37,20,15,16,2,88,163,45,38,51,8,128,4,2,9,223,0,33,74,80,159,
11,223,0,33,77,80,159,36,45,37,20,15,16,2,248,22,188,14,70,108,105, 36,43,37,20,15,16,2,88,163,45,39,52,8,128,4,2,11,223,0,33,77,
110,107,115,45,102,105,108,101,80,159,36,46,37,20,15,16,2,247,22,133,2, 80,159,36,45,37,20,15,16,2,248,22,188,14,70,108,105,110,107,115,45,102,
80,158,36,47,20,15,16,2,2,78,80,158,36,48,20,15,16,2,248,80,159, 105,108,101,80,159,36,46,37,20,15,16,2,247,22,133,2,80,158,36,47,20,
37,50,37,88,163,36,36,49,8,240,8,128,1,0,9,223,1,33,79,80,159, 15,16,2,2,78,80,158,36,48,20,15,16,2,248,80,159,37,50,37,88,163,
36,49,37,20,15,16,2,247,22,133,2,80,158,36,53,20,15,16,2,2,78, 36,36,49,8,240,8,128,1,0,9,223,1,33,79,80,159,36,49,37,20,15,
80,158,36,54,20,15,16,2,88,163,36,37,44,8,240,0,188,23,0,2,22, 16,2,247,22,133,2,80,158,36,53,20,15,16,2,2,78,80,158,36,54,20,
223,0,33,90,80,159,36,55,37,20,15,16,2,88,163,36,38,56,8,240,0, 15,16,2,88,163,36,37,44,8,240,0,188,23,0,2,22,223,0,33,90,80,
0,32,0,2,23,223,0,33,92,80,159,36,57,37,20,15,16,2,88,163,36, 159,36,55,37,20,15,16,2,88,163,36,38,56,8,240,0,0,32,0,2,23,
41,59,8,240,0,32,40,0,2,10,223,0,33,99,80,159,36,44,37,20,15, 223,0,33,92,80,159,36,57,37,20,15,16,2,88,163,36,41,8,24,8,240,
16,2,32,0,88,163,36,39,50,11,2,24,222,33,100,80,159,36,58,37,20, 0,32,40,0,2,10,223,0,33,99,80,159,36,44,37,20,15,16,2,32,0,
15,16,2,32,0,88,163,36,38,53,11,2,25,222,33,101,80,159,36,59,37, 88,163,36,39,50,11,2,24,222,33,100,80,159,36,58,37,20,15,16,2,32,
20,15,16,2,32,0,88,163,36,38,54,11,2,26,222,33,102,80,159,36,8, 0,88,163,36,38,53,11,2,25,222,33,101,80,159,36,59,37,20,15,16,2,
24,37,20,15,16,2,32,0,88,163,36,37,44,11,2,27,222,33,103,80,159, 32,0,88,163,36,38,54,11,2,26,222,33,102,80,159,36,8,24,37,20,15,
36,8,25,37,20,15,16,2,20,25,96,2,28,88,163,36,36,53,16,2,52, 16,2,32,0,88,163,36,37,44,11,2,27,222,33,103,80,159,36,8,25,37,
8,128,64,9,223,0,33,104,88,163,36,37,54,16,2,52,8,128,128,9,223, 20,15,16,2,20,25,96,2,28,88,163,36,36,53,16,2,52,8,128,64,9,
0,33,105,88,163,36,38,55,16,2,52,8,240,0,64,0,0,9,223,0,33, 223,0,33,104,88,163,36,37,54,16,2,52,8,128,128,9,223,0,33,105,88,
106,80,159,36,8,26,37,20,15,16,2,88,163,8,36,39,54,16,2,44,8, 163,36,38,55,16,2,52,8,240,0,64,0,0,9,223,0,33,106,80,159,36,
240,0,128,0,0,2,29,223,0,33,108,80,159,36,8,27,37,95,29,94,2, 8,26,37,20,15,16,2,88,163,8,36,39,54,16,2,44,8,240,0,128,0,
16,68,35,37,107,101,114,110,101,108,11,29,94,2,16,69,35,37,109,105,110, 0,2,29,223,0,33,108,80,159,36,8,27,37,95,29,94,2,16,68,35,37,
45,115,116,120,11,2,18,9,9,9,36,0}; 107,101,114,110,101,108,11,29,94,2,16,69,35,37,109,105,110,45,115,116,120,
EVAL_ONE_SIZED_STR((char *)expr, 10406); 11,2,18,9,9,9,36,0};
EVAL_ONE_SIZED_STR((char *)expr, 10423);
} }
{ {
SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,53,0,0,0,0,0,0,0,0,0,0,0, SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,54,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,12,0,0,0,1,0,0,15,0,40,0,57, 0,0,0,0,0,0,0,0,0,12,0,0,0,1,0,0,15,0,40,0,57,
0,75,0,97,0,120,0,140,0,162,0,169,0,176,0,183,0,0,0,178,1, 0,75,0,97,0,120,0,140,0,162,0,169,0,176,0,183,0,0,0,178,1,
0,0,74,35,37,112,108,97,99,101,45,115,116,114,117,99,116,1,23,115,116, 0,0,74,35,37,112,108,97,99,101,45,115,116,114,117,99,116,1,23,115,116,
@ -624,7 +625,7 @@
EVAL_ONE_SIZED_STR((char *)expr, 499); EVAL_ONE_SIZED_STR((char *)expr, 499);
} }
{ {
SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,53,0,0,0,0,0,0,0,0,0,0,0, SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,54,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,65,0,0,0,1,0,0,7,0,18,0,45, 0,0,0,0,0,0,0,0,0,65,0,0,0,1,0,0,7,0,18,0,45,
0,51,0,64,0,73,0,80,0,102,0,124,0,150,0,158,0,170,0,185,0, 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, 201,0,219,0,239,0,251,0,11,1,34,1,46,1,77,1,84,1,89,1,94,
@ -652,7 +653,7 @@
101,5,3,46,122,111,5,3,46,122,111,6,6,6,110,97,116,105,118,101,64, 101,5,3,46,122,111,5,3,46,122,111,6,6,6,110,97,116,105,118,101,64,
108,111,111,112,63,108,105,98,67,105,103,110,111,114,101,100,249,22,14,195,80, 108,111,111,112,63,108,105,98,67,105,103,110,111,114,101,100,249,22,14,195,80,
159,38,49,38,249,80,159,38,52,39,195,10,90,159,39,11,89,161,39,36,11, 159,38,49,38,249,80,159,38,52,39,195,10,90,159,39,11,89,161,39,36,11,
248,22,169,14,197,86,95,23,195,1,23,193,1,28,249,22,135,15,0,11,35, 248,22,169,14,197,86,95,23,195,1,23,193,1,28,249,22,136,15,0,11,35,
114,120,34,91,46,93,115,115,36,34,248,22,153,14,23,197,1,249,80,159,41, 114,120,34,91,46,93,115,115,36,34,248,22,153,14,23,197,1,249,80,159,41,
56,39,198,5,4,46,114,107,116,196,27,28,23,195,2,28,249,22,140,9,23, 56,39,198,5,4,46,114,107,116,196,27,28,23,195,2,28,249,22,140,9,23,
197,2,80,158,39,50,86,94,23,195,1,80,158,37,51,27,248,22,137,5,23, 197,2,80,158,39,50,86,94,23,195,1,80,158,37,51,27,248,22,137,5,23,
@ -709,7 +710,7 @@
159,80,159,57,40,37,250,80,159,8,24,41,37,249,22,27,11,80,159,8,26, 159,80,159,57,40,37,250,80,159,8,24,41,37,249,22,27,11,80,159,8,26,
40,37,22,180,4,11,20,13,159,80,159,57,40,37,250,80,159,8,24,41,37, 40,37,22,180,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,159,5,28,248,22,148,14,23,216,2, 249,22,27,11,80,159,8,26,40,37,22,159,5,28,248,22,148,14,23,216,2,
23,215,1,86,94,23,215,1,247,22,189,14,249,247,22,130,15,248,22,74,195, 23,215,1,86,94,23,215,1,247,22,189,14,249,247,22,131,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, 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,41,23,217,2,27,28,23,204,2, 163,8,36,37,53,45,9,225,25,23,20,33,41,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, 11,193,28,192,192,28,193,28,203,28,249,22,188,3,248,22,75,196,248,22,75,
@ -719,7 +720,7 @@
11,80,159,8,27,40,37,22,180,4,23,215,1,20,13,159,80,159,58,40,37, 11,80,159,8,27,40,37,22,180,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,159,5,28, 250,80,159,8,25,41,37,249,22,27,11,80,159,8,27,40,37,22,159,5,28,
248,22,148,14,23,217,2,23,216,1,86,94,23,216,1,247,22,189,14,249,247, 248,22,148,14,23,217,2,23,216,1,86,94,23,216,1,247,22,189,14,249,247,
22,130,15,248,22,74,195,23,26,86,94,23,193,1,27,28,23,197,2,28,23, 22,131,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, 201,1,27,249,22,5,20,20,94,88,163,8,36,37,51,44,9,225,26,24,20,
33,42,23,213,1,23,218,2,27,28,23,204,2,11,193,28,192,192,28,193,28, 33,42,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, 23,204,2,28,249,22,188,3,248,22,75,196,248,22,75,23,207,2,193,11,11,
@ -751,12 +752,12 @@
40,45,38,195,27,28,193,248,22,169,2,194,11,250,22,161,8,80,159,42,45, 40,45,38,195,27,28,193,248,22,169,2,194,11,250,22,161,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, 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,48,88,163,8, 114,120,34,94,40,46,42,63,41,47,40,46,42,41,36,34,32,48,88,163,8,
36,37,59,11,2,29,222,33,49,27,249,22,135,15,2,47,23,196,2,28,23, 36,37,59,11,2,29,222,33,49,27,249,22,136,15,2,47,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, 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,135,15,2,47,23,196,2,28,23,193,2,86,94,23,194,1, 197,1,27,249,22,136,15,2,47,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,135,15, 249,22,73,248,22,98,23,196,2,27,248,22,107,23,197,1,27,249,22,136,15,
2,47,23,196,2,28,23,193,2,86,94,23,194,1,249,22,73,248,22,98,23, 2,47,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,135,15,2,47,23,196,2,28,23, 196,2,27,248,22,107,23,197,1,27,249,22,136,15,2,47,23,196,2,28,23,
193,2,86,94,23,194,1,249,22,73,248,22,98,23,196,2,248,2,48,248,22, 193,2,86,94,23,194,1,249,22,73,248,22,98,23,196,2,248,2,48,248,22,
107,23,197,1,248,22,83,194,248,22,83,194,248,22,83,194,248,22,83,194,32, 107,23,197,1,248,22,83,194,248,22,83,194,248,22,83,194,248,22,83,194,32,
50,88,163,36,37,55,11,2,29,222,33,51,28,248,22,81,248,22,75,23,195, 50,88,163,36,37,55,11,2,29,222,33,51,28,248,22,81,248,22,75,23,195,
@ -766,12 +767,12 @@
195,2,249,22,7,9,248,22,74,195,90,159,38,11,89,161,38,36,11,248,2, 195,2,249,22,7,9,248,22,74,195,90,159,38,11,89,161,38,36,11,248,2,
50,248,22,75,196,249,22,7,249,22,73,248,22,74,199,196,195,249,22,7,249, 50,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, 22,73,248,22,74,199,196,195,249,22,7,249,22,73,248,22,74,199,196,195,27,
27,249,22,135,15,2,47,23,197,2,28,23,193,2,86,94,23,195,1,249,22, 27,249,22,136,15,2,47,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,135,15,2,47, 73,248,22,98,23,196,2,27,248,22,107,23,197,1,27,249,22,136,15,2,47,
23,196,2,28,23,193,2,86,94,23,194,1,249,22,73,248,22,98,23,196,2, 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,135,15,2,47,23,196,2,28,23,193,2, 27,248,22,107,23,197,1,27,249,22,136,15,2,47,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, 86,94,23,194,1,249,22,73,248,22,98,23,196,2,27,248,22,107,23,197,1,
27,249,22,135,15,2,47,23,196,2,28,23,193,2,86,94,23,194,1,249,22, 27,249,22,136,15,2,47,23,196,2,28,23,193,2,86,94,23,194,1,249,22,
73,248,22,98,23,196,2,248,2,48,248,22,107,23,197,1,248,22,83,194,248, 73,248,22,98,23,196,2,248,2,48,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,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, 22,75,23,195,2,249,22,7,9,248,22,74,195,27,248,22,75,194,90,159,38,
@ -783,9 +784,9 @@
200,196,195,86,95,28,248,22,135,5,195,12,250,22,176,9,2,21,6,20,20, 200,196,195,86,95,28,248,22,135,5,195,12,250,22,176,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, 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, 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,160,15,247,22,190,12,11,27,28,23,194,2,193,86,94, 159,41,43,38,248,22,161,15,247,22,190,12,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, 23,194,1,27,247,22,133,2,86,94,250,22,151,2,80,159,43,43,38,248,22,
160,15,247,22,190,12,195,192,250,22,151,2,195,199,66,97,116,116,97,99,104, 161,15,247,22,190,12,195,192,250,22,151,2,195,199,66,97,116,116,97,99,104,
251,211,197,198,199,10,28,192,250,22,175,9,11,196,195,248,22,173,9,194,28, 251,211,197,198,199,10,28,192,250,22,175,9,11,196,195,248,22,173,9,194,28,
249,22,136,7,194,6,1,1,46,2,25,28,249,22,136,7,194,6,2,2,46, 249,22,136,7,194,6,1,1,46,2,25,28,249,22,136,7,194,6,2,2,46,
46,62,117,112,192,32,57,88,163,8,36,37,50,11,67,115,115,45,62,114,107, 46,62,117,112,192,32,57,88,163,8,36,37,50,11,67,115,115,45,62,114,107,
@ -796,7 +797,7 @@
22,74,23,200,2,23,196,1,251,22,173,9,2,21,6,28,28,99,121,99,108, 22,74,23,200,2,23,196,1,251,22,173,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, 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, 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,40,48,38,249,22,73,248,22,160,15, 202,1,12,12,247,192,20,13,159,80,159,40,48,38,249,22,73,248,22,161,15,
247,22,190,12,23,197,1,20,13,159,80,159,40,40,37,250,80,159,43,41,37, 247,22,190,12,23,197,1,20,13,159,80,159,40,40,37,250,80,159,43,41,37,
249,22,27,11,80,159,45,40,37,22,179,4,23,196,1,249,247,22,158,5,23, 249,22,27,11,80,159,45,40,37,22,179,4,23,196,1,249,247,22,158,5,23,
198,1,248,22,61,248,22,152,14,23,198,1,86,94,28,28,248,22,148,14,23, 198,1,248,22,61,248,22,152,14,23,198,1,86,94,28,28,248,22,148,14,23,
@ -832,9 +833,9 @@
73,23,201,2,247,22,190,14,28,23,193,2,192,86,94,23,193,1,90,159,39, 73,23,201,2,247,22,190,14,28,23,193,2,192,86,94,23,193,1,90,159,39,
11,89,161,38,36,11,249,80,159,45,52,39,248,22,98,23,204,2,11,89,161, 11,89,161,38,36,11,249,80,159,45,52,39,248,22,98,23,204,2,11,89,161,
37,38,11,28,248,22,81,248,22,100,23,203,2,28,248,22,81,23,194,2,249, 37,38,11,28,248,22,81,248,22,100,23,203,2,28,248,22,81,23,194,2,249,
22,139,15,0,8,35,114,120,34,91,46,93,34,23,196,2,11,10,27,28,23, 22,140,15,0,8,35,114,120,34,91,46,93,34,23,196,2,11,10,27,28,23,
196,2,248,2,57,23,196,2,28,248,22,81,23,195,2,6,8,8,109,97,105, 196,2,248,2,57,23,196,2,28,248,22,81,23,195,2,6,8,8,109,97,105,
110,46,114,107,116,28,249,22,139,15,0,8,35,114,120,34,91,46,93,34,23, 110,46,114,107,116,28,249,22,140,15,0,8,35,114,120,34,91,46,93,34,23,
197,2,248,2,57,23,196,2,249,22,153,7,23,197,2,6,4,4,46,114,107, 197,2,248,2,57,23,196,2,249,22,153,7,23,197,2,6,4,4,46,114,107,
116,27,28,23,197,1,86,94,23,196,1,249,22,87,28,248,22,81,248,22,100, 116,27,28,23,197,1,86,94,23,196,1,249,22,87,28,248,22,81,248,22,100,
23,207,2,21,93,6,5,5,109,122,108,105,98,249,22,1,22,87,249,22,2, 23,207,2,21,93,6,5,5,109,122,108,105,98,249,22,1,22,87,249,22,2,
@ -858,12 +859,12 @@
23,193,1,27,28,248,22,155,8,23,200,2,249,22,160,8,23,201,2,39,249, 23,193,1,27,28,248,22,155,8,23,200,2,249,22,160,8,23,201,2,39,249,
80,159,47,56,39,23,197,2,5,0,27,28,248,22,155,8,23,201,2,249,22, 80,159,47,56,39,23,197,2,5,0,27,28,248,22,155,8,23,201,2,249,22,
160,8,23,202,2,40,248,22,136,5,23,200,2,27,27,250,22,153,2,80,159, 160,8,23,202,2,40,248,22,136,5,23,200,2,27,27,250,22,153,2,80,159,
51,43,38,248,22,160,15,247,22,190,12,11,28,23,193,2,192,86,94,23,193, 51,43,38,248,22,161,15,247,22,190,12,11,28,23,193,2,192,86,94,23,193,
1,27,247,22,133,2,86,94,250,22,151,2,80,159,52,43,38,248,22,160,15, 1,27,247,22,133,2,86,94,250,22,151,2,80,159,52,43,38,248,22,161,15,
247,22,190,12,195,192,86,95,28,23,208,1,27,250,22,153,2,23,197,2,197, 247,22,190,12,195,192,86,95,28,23,208,1,27,250,22,153,2,23,197,2,197,
11,28,23,193,1,12,86,95,27,27,28,248,22,17,80,159,51,49,38,80,159, 11,28,23,193,1,12,86,95,27,27,28,248,22,17,80,159,51,49,38,80,159,
50,49,38,247,22,19,250,22,25,248,22,23,23,197,2,80,159,53,48,38,23, 50,49,38,247,22,19,250,22,25,248,22,23,23,197,2,80,159,53,48,38,23,
196,1,27,248,22,160,15,247,22,190,12,249,22,3,20,20,94,88,163,8,36, 196,1,27,248,22,161,15,247,22,190,12,249,22,3,20,20,94,88,163,8,36,
37,55,11,9,226,12,11,2,3,33,59,23,195,1,23,196,1,248,28,248,22, 37,55,11,9,226,12,11,2,3,33,59,23,195,1,23,196,1,248,28,248,22,
17,80,159,50,49,38,32,0,88,163,36,37,42,11,9,222,33,60,80,159,49, 17,80,159,50,49,38,32,0,88,163,36,37,42,11,9,222,33,60,80,159,49,
8,29,39,88,163,36,36,51,8,176,64,9,227,13,9,8,4,3,33,61,250, 8,29,39,88,163,36,36,51,8,176,64,9,227,13,9,8,4,3,33,61,250,
@ -925,7 +926,7 @@
EVAL_ONE_SIZED_STR((char *)expr, 6244); EVAL_ONE_SIZED_STR((char *)expr, 6244);
} }
{ {
SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,53,0,0,0,0,0,0,0,0,0,0,0, SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,53,46,49,46,51,46,54,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,11,0,0,0,1,0,0,10,0,16,0,29, 0,0,0,0,0,0,0,0,0,11,0,0,0,1,0,0,10,0,16,0,29,
0,44,0,58,0,78,0,90,0,104,0,118,0,170,0,0,0,97,1,0,0, 0,44,0,58,0,78,0,90,0,104,0,118,0,170,0,0,0,97,1,0,0,
69,35,37,98,117,105,108,116,105,110,65,113,117,111,116,101,29,94,2,2,67, 69,35,37,98,117,105,108,116,105,110,65,113,117,111,116,101,29,94,2,2,67,
@ -933,7 +934,7 @@
107,11,29,94,2,2,68,35,37,112,97,114,97,109,122,11,29,94,2,2,74, 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, 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, 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,48,78,0, 94,2,2,68,35,37,107,101,114,110,101,108,11,97,36,11,8,240,56,78,0,
0,100,159,2,3,36,36,159,2,4,36,36,159,2,5,36,36,159,2,6,36, 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, 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,112,159,36,16,1,11,16,0,20,26,142,2,1,2,1,29, 16,0,159,36,20,112,159,36,16,1,11,16,0,20,26,142,2,1,2,1,29,

17
src/racket/src/file.c
View File

@ -131,6 +131,9 @@ long scheme_creator_id = 'MzSc';
SHARED_OK int scheme_ignore_user_paths; SHARED_OK int scheme_ignore_user_paths;
void scheme_set_ignore_user_paths(int v) { scheme_ignore_user_paths = v; } void scheme_set_ignore_user_paths(int v) { scheme_ignore_user_paths = v; }
SHARED_OK int scheme_ignore_link_paths;
void scheme_set_ignore_link_paths(int v) { scheme_ignore_link_paths = v; }
#define CURRENT_WD() scheme_get_param(scheme_current_config(), MZCONFIG_CURRENT_DIRECTORY) #define CURRENT_WD() scheme_get_param(scheme_current_config(), MZCONFIG_CURRENT_DIRECTORY)
#define TO_PATH(x) (SCHEME_GENERAL_PATHP(x) ? x : scheme_char_string_to_path(x)) #define TO_PATH(x) (SCHEME_GENERAL_PATHP(x) ? x : scheme_char_string_to_path(x))
@ -200,6 +203,7 @@ static Scheme_Object *file_size(int argc, Scheme_Object *argv[]);
static Scheme_Object *current_library_collection_paths(int argc, Scheme_Object *argv[]); static Scheme_Object *current_library_collection_paths(int argc, Scheme_Object *argv[]);
static Scheme_Object *use_compiled_kind(int, Scheme_Object *[]); static Scheme_Object *use_compiled_kind(int, Scheme_Object *[]);
static Scheme_Object *use_user_paths(int, Scheme_Object *[]); static Scheme_Object *use_user_paths(int, Scheme_Object *[]);
static Scheme_Object *use_link_paths(int, Scheme_Object *[]);
static Scheme_Object *find_system_path(int argc, Scheme_Object **argv); static Scheme_Object *find_system_path(int argc, Scheme_Object **argv);
#endif #endif
@ -549,6 +553,11 @@ void scheme_init_file(Scheme_Env *env)
"use-user-specific-search-paths", "use-user-specific-search-paths",
MZCONFIG_USE_USER_PATHS), MZCONFIG_USE_USER_PATHS),
env); env);
scheme_add_global_constant("use-collection-link-paths",
scheme_register_parameter(use_link_paths,
"use-collection-link-paths",
MZCONFIG_USE_LINK_PATHS),
env);
} }
void scheme_init_file_places() void scheme_init_file_places()
@ -5817,6 +5826,14 @@ static Scheme_Object *use_user_paths(int argc, Scheme_Object *argv[])
-1, NULL, NULL, 1); -1, NULL, NULL, 1);
} }
static Scheme_Object *use_link_paths(int argc, Scheme_Object *argv[])
{
return scheme_param_config("use-collection-link-paths",
scheme_make_integer(MZCONFIG_USE_LINK_PATHS),
argc, argv,
-1, NULL, NULL, 1);
}
/********************************************************************************/ /********************************************************************************/
#ifndef NO_FILE_SYSTEM_UTILS #ifndef NO_FILE_SYSTEM_UTILS

1
src/racket/src/portfun.c
View File

@ -342,6 +342,7 @@ void scheme_init_port_fun_config(void)
else else
scheme_set_root_param(MZCONFIG_USE_COMPILED_KIND, scheme_make_pair(scheme_make_path("compiled"), scheme_null)); scheme_set_root_param(MZCONFIG_USE_COMPILED_KIND, scheme_make_pair(scheme_make_path("compiled"), scheme_null));
scheme_set_root_param(MZCONFIG_USE_USER_PATHS, (scheme_ignore_user_paths ? scheme_false : scheme_true)); scheme_set_root_param(MZCONFIG_USE_USER_PATHS, (scheme_ignore_user_paths ? scheme_false : scheme_true));
scheme_set_root_param(MZCONFIG_USE_LINK_PATHS, (scheme_ignore_link_paths ? scheme_false : scheme_true));
{ {
Scheme_Object *dlh; Scheme_Object *dlh;

2
src/racket/src/schminc.h
View File

@ -13,7 +13,7 @@
#define USE_COMPILED_STARTUP 1 #define USE_COMPILED_STARTUP 1
#define EXPECTED_PRIM_COUNT 1030 #define EXPECTED_PRIM_COUNT 1031
#define EXPECTED_UNSAFE_COUNT 78 #define EXPECTED_UNSAFE_COUNT 78
#define EXPECTED_FLFXNUM_COUNT 68 #define EXPECTED_FLFXNUM_COUNT 68
#define EXPECTED_FUTURES_COUNT 11 #define EXPECTED_FUTURES_COUNT 11

4
src/racket/src/schvers.h
View File

@ -13,12 +13,12 @@
consistently.) consistently.)
*/ */
#define MZSCHEME_VERSION "5.1.3.5" #define MZSCHEME_VERSION "5.1.3.6"
#define MZSCHEME_VERSION_X 5 #define MZSCHEME_VERSION_X 5
#define MZSCHEME_VERSION_Y 1 #define MZSCHEME_VERSION_Y 1
#define MZSCHEME_VERSION_Z 3 #define MZSCHEME_VERSION_Z 3
#define MZSCHEME_VERSION_W 5 #define MZSCHEME_VERSION_W 6
#define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y) #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
#define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W) #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)

7
src/racket/src/startup.inc
View File

@ -434,14 +434,15 @@
"(normalize-collection-reference collection collection-path)))" "(normalize-collection-reference collection collection-path)))"
"(let((all-paths(let((sym(string->symbol(if(path? collection)" "(let((all-paths(let((sym(string->symbol(if(path? collection)"
"(path->string collection)" "(path->string collection)"
" collection))))" " collection)))"
"(links?(use-collection-link-paths)))"
"(append" "(append"
"(if(use-user-specific-search-paths)" "(if(and links?(use-user-specific-search-paths))"
"(let((ht(get-linked-collections #t)))" "(let((ht(get-linked-collections #t)))"
"(or(hash-ref ht sym #f)" "(or(hash-ref ht sym #f)"
"(hash-ref ht #f null)))" "(hash-ref ht #f null)))"
" null)" " null)"
"(if links-path" "(if(and links? links-path)"
"(let((ht(get-linked-collections #f)))" "(let((ht(get-linked-collections #f)))"
"(or(hash-ref ht sym #f)" "(or(hash-ref ht sym #f)"
"(hash-ref ht #f null)))" "(hash-ref ht #f null)))"

7
src/racket/src/startup.rktl
View File

@ -511,16 +511,17 @@
(normalize-collection-reference collection collection-path)]) (normalize-collection-reference collection collection-path)])
(let ([all-paths (let ([sym (string->symbol (if (path? collection) (let ([all-paths (let ([sym (string->symbol (if (path? collection)
(path->string collection) (path->string collection)
collection))]) collection))]
[links? (use-collection-link-paths)])
(append (append
;; list of paths and (box path)s: ;; list of paths and (box path)s:
(if (use-user-specific-search-paths) (if (and links? (use-user-specific-search-paths))
(let ([ht (get-linked-collections #t)]) (let ([ht (get-linked-collections #t)])
(or (hash-ref ht sym #f) (or (hash-ref ht sym #f)
(hash-ref ht #f null))) (hash-ref ht #f null)))
null) null)
;; list of paths and (box path)s: ;; list of paths and (box path)s:
(if links-path (if (and links? links-path)
(let ([ht (get-linked-collections #f)]) (let ([ht (get-linked-collections #f)])
(or (hash-ref ht sym #f) (or (hash-ref ht sym #f)
(hash-ref ht #f null))) (hash-ref ht #f null)))