make-rename-transformer => free-identifier=? (v5.1.5.2)

svn: r14160
This commit is contained in:
Matthew Flatt 2009-03-17 21:05:53 +00:00
parent e8dba7c7b1
commit 09914dda3f
14 changed files with 1193 additions and 483 deletions

View File

@ -790,7 +790,7 @@ typedef struct {
typedef struct Scheme_Hash_Table
{
Scheme_Inclhash_Object iso;
Scheme_Inclhash_Object iso; /* 0x1 flag => marshal as #t (hack for stxobj bytecode) */
int size; /* power of 2 */
int count;
Scheme_Object **keys;
@ -1024,6 +1024,7 @@ typedef struct Scheme_Thread {
struct Scheme_Marshal_Tables *current_mt;
Scheme_Object *constant_folding; /* compiler hack */
Scheme_Object *reading_delayed; /* reader hack */
Scheme_Object *(*overflow_k)(void);
Scheme_Object *overflow_reply;

View File

@ -1,5 +1,5 @@
{
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,52,46,50,50,0,0,0,1,0,0,3,0,12,0,
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,53,46,50,50,0,0,0,1,0,0,3,0,12,0,
17,0,20,0,27,0,40,0,47,0,51,0,58,0,63,0,68,0,72,0,78,
0,92,0,106,0,109,0,115,0,119,0,121,0,132,0,134,0,148,0,155,0,
177,0,179,0,193,0,253,0,23,1,32,1,41,1,51,1,87,1,126,1,165,
@ -14,13 +14,13 @@
115,61,120,73,108,101,116,114,101,99,45,118,97,108,117,101,115,66,108,97,109,
98,100,97,1,20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,
45,107,101,121,61,118,73,100,101,102,105,110,101,45,118,97,108,117,101,115,98,
10,35,11,8,134,228,94,159,2,15,35,35,159,2,14,35,35,16,20,2,3,
10,35,11,8,148,228,94,159,2,15,35,35,159,2,14,35,35,16,20,2,3,
2,1,2,5,2,1,2,6,2,1,2,7,2,1,2,8,2,1,2,9,2,
1,2,10,2,1,2,4,2,1,2,11,2,1,2,12,2,1,97,36,11,8,
134,228,93,159,2,14,35,36,16,2,2,2,161,2,1,36,2,2,2,1,2,
2,97,10,11,11,8,134,228,16,0,97,10,37,11,8,134,228,16,0,13,16,
148,228,93,159,2,14,35,36,16,2,2,2,161,2,1,36,2,2,2,1,2,
2,97,10,11,11,8,148,228,16,0,97,10,37,11,8,148,228,16,0,13,16,
4,35,29,11,11,2,1,11,18,16,2,99,64,104,101,114,101,8,31,8,30,
8,29,8,28,8,27,93,8,224,13,57,0,0,95,9,8,224,13,57,0,0,
8,29,8,28,8,27,93,8,224,27,57,0,0,95,9,8,224,27,57,0,0,
2,1,27,248,22,135,4,23,196,1,249,22,128,4,80,158,38,35,251,22,75,
2,16,248,22,90,23,200,2,12,249,22,65,2,17,248,22,92,23,202,1,27,
248,22,135,4,23,196,1,249,22,128,4,80,158,38,35,251,22,75,2,16,248,
@ -29,16 +29,16 @@
248,22,73,248,22,67,23,195,2,248,22,66,193,249,22,128,4,80,158,38,35,
251,22,75,2,16,248,22,66,23,200,2,249,22,65,2,12,248,22,67,23,202,
1,11,18,16,2,101,10,8,31,8,30,8,29,8,28,8,27,16,4,11,11,
2,18,3,1,7,101,110,118,57,55,57,53,16,4,11,11,2,19,3,1,7,
101,110,118,57,55,57,54,93,8,224,14,57,0,0,95,9,8,224,14,57,0,
2,18,3,1,7,101,110,118,57,56,48,52,16,4,11,11,2,19,3,1,7,
101,110,118,57,56,48,53,93,8,224,28,57,0,0,95,9,8,224,28,57,0,
0,2,1,27,248,22,67,248,22,135,4,23,197,1,28,248,22,73,23,194,2,
20,15,159,36,35,36,28,248,22,73,248,22,67,23,195,2,248,22,66,193,249,
22,128,4,80,158,38,35,250,22,75,2,20,248,22,75,249,22,75,248,22,75,
2,21,248,22,66,23,202,2,251,22,75,2,16,2,21,2,21,249,22,65,2,
4,248,22,67,23,205,1,18,16,2,101,11,8,31,8,30,8,29,8,28,8,
27,16,4,11,11,2,18,3,1,7,101,110,118,57,55,57,56,16,4,11,11,
2,19,3,1,7,101,110,118,57,55,57,57,93,8,224,15,57,0,0,95,9,
8,224,15,57,0,0,2,1,248,22,135,4,193,27,248,22,135,4,194,249,22,
27,16,4,11,11,2,18,3,1,7,101,110,118,57,56,48,55,16,4,11,11,
2,19,3,1,7,101,110,118,57,56,48,56,93,8,224,29,57,0,0,95,9,
8,224,29,57,0,0,2,1,248,22,135,4,193,27,248,22,135,4,194,249,22,
65,248,22,75,248,22,66,196,248,22,67,195,27,248,22,67,248,22,135,4,23,
197,1,249,22,128,4,80,158,38,35,28,248,22,53,248,22,129,4,248,22,66,
23,198,2,27,249,22,2,32,0,89,162,8,44,36,42,9,222,33,39,248,22,
@ -68,9 +68,9 @@
249,22,164,8,248,22,129,4,248,22,66,23,201,2,64,101,108,115,101,10,248,
22,66,23,198,2,250,22,76,2,20,9,248,22,67,23,201,1,249,22,65,2,
3,248,22,67,23,203,1,100,8,31,8,30,8,29,8,28,8,27,16,4,11,
11,2,18,3,1,7,101,110,118,57,56,50,49,16,4,11,11,2,19,3,1,
7,101,110,118,57,56,50,50,93,8,224,16,57,0,0,18,16,2,158,94,10,
64,118,111,105,100,8,47,95,9,8,224,16,57,0,0,2,1,27,248,22,67,
11,2,18,3,1,7,101,110,118,57,56,51,48,16,4,11,11,2,19,3,1,
7,101,110,118,57,56,51,49,93,8,224,30,57,0,0,18,16,2,158,94,10,
64,118,111,105,100,8,47,95,9,8,224,30,57,0,0,2,1,27,248,22,67,
248,22,135,4,196,249,22,128,4,80,158,38,35,28,248,22,53,248,22,129,4,
248,22,66,197,250,22,75,2,26,248,22,75,248,22,66,199,248,22,90,198,27,
248,22,129,4,248,22,66,197,250,22,75,2,26,248,22,75,248,22,66,197,250,
@ -100,7 +100,7 @@
EVAL_ONE_SIZED_STR((char *)expr, 2045);
}
{
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,52,46,50,59,0,0,0,1,0,0,13,0,18,0,
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,53,46,50,59,0,0,0,1,0,0,13,0,18,0,
35,0,50,0,68,0,84,0,94,0,112,0,132,0,148,0,166,0,197,0,226,
0,248,0,6,1,12,1,26,1,31,1,41,1,49,1,77,1,109,1,154,1,
199,1,223,1,6,2,8,2,65,2,155,3,196,3,31,5,135,5,239,5,100,
@ -342,12 +342,12 @@
EVAL_ONE_SIZED_STR((char *)expr, 5009);
}
{
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,52,46,50,8,0,0,0,1,0,0,6,0,19,0,
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,53,46,50,8,0,0,0,1,0,0,6,0,19,0,
34,0,48,0,62,0,76,0,111,0,0,0,1,1,0,0,65,113,117,111,116,
101,29,94,2,1,67,35,37,117,116,105,108,115,11,29,94,2,1,69,35,37,
110,101,116,119,111,114,107,11,29,94,2,1,68,35,37,112,97,114,97,109,122,
11,29,94,2,1,68,35,37,101,120,112,111,98,115,11,29,94,2,1,68,35,
37,107,101,114,110,101,108,11,98,10,35,11,8,140,230,97,159,2,2,35,35,
37,107,101,114,110,101,108,11,98,10,35,11,8,154,230,97,159,2,2,35,35,
159,2,3,35,35,159,2,4,35,35,159,2,5,35,35,159,2,6,35,35,16,
0,159,35,20,103,159,35,16,1,11,16,0,83,158,41,20,100,143,69,35,37,
98,117,105,108,116,105,110,29,11,11,11,10,10,18,96,11,42,42,42,35,80,
@ -360,12 +360,12 @@
EVAL_ONE_SIZED_STR((char *)expr, 294);
}
{
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,52,46,50,52,0,0,0,1,0,0,11,0,38,0,
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,53,46,50,52,0,0,0,1,0,0,11,0,38,0,
44,0,57,0,71,0,93,0,119,0,131,0,149,0,169,0,181,0,197,0,220,
0,0,1,5,1,10,1,15,1,24,1,29,1,60,1,64,1,72,1,81,1,
89,1,196,1,241,1,5,2,34,2,65,2,121,2,131,2,178,2,188,2,195,
2,82,4,95,4,114,4,233,4,245,4,141,5,155,5,21,6,27,6,41,6,
68,6,153,6,155,6,221,6,166,12,225,12,3,13,0,0,138,15,0,0,70,
89,1,192,1,237,1,1,2,30,2,61,2,117,2,127,2,174,2,184,2,191,
2,78,4,91,4,110,4,229,4,241,4,137,5,151,5,17,6,23,6,37,6,
64,6,149,6,151,6,217,6,162,12,221,12,255,12,0,0,134,15,0,0,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,3,67,35,37,117,116,105,108,115,11,29,94,2,3,68,35,37,
@ -383,178 +383,178 @@
45,109,111,100,117,108,101,45,110,97,109,101,45,114,101,115,111,108,118,101,114,
63,108,105,98,67,105,103,110,111,114,101,100,249,22,14,195,80,159,37,45,37,
249,80,159,37,48,36,195,10,27,28,23,195,2,28,249,22,164,8,23,197,2,
80,159,38,46,37,87,94,23,195,1,80,159,36,47,37,27,248,22,173,4,23,
197,2,28,248,22,139,13,23,194,2,91,159,38,11,90,161,38,35,11,248,22,
160,13,23,197,1,87,95,83,160,37,11,80,159,40,46,37,198,83,160,37,11,
80,159,40,47,37,192,192,11,11,28,23,193,2,192,87,94,23,193,1,27,247,
22,191,4,28,192,192,247,22,179,13,20,14,159,80,158,35,39,250,80,158,38,
40,249,22,27,11,80,158,40,39,22,191,4,28,248,22,139,13,23,198,2,23,
197,1,87,94,23,197,1,247,22,179,13,247,194,250,22,157,13,23,197,1,23,
199,1,249,80,158,42,38,23,198,1,2,17,252,22,157,13,23,199,1,23,201,
1,2,18,247,22,179,7,249,80,158,44,38,23,200,1,80,159,44,35,37,87,
94,23,194,1,27,250,22,174,13,196,11,32,0,89,162,8,44,35,40,9,222,
11,28,192,249,22,65,195,194,11,27,252,22,157,13,23,200,1,23,202,1,2,
18,247,22,179,7,249,80,158,45,38,23,201,1,80,159,45,35,37,27,250,22,
174,13,196,11,32,0,89,162,8,44,35,40,9,222,11,28,192,249,22,65,195,
194,11,249,247,22,184,13,248,22,66,195,195,27,250,22,157,13,23,198,1,23,
200,1,249,80,158,43,38,23,199,1,2,17,27,250,22,174,13,196,11,32,0,
89,162,8,44,35,40,9,222,11,28,192,249,22,65,195,194,11,249,247,22,189,
4,248,22,66,195,195,249,247,22,189,4,194,195,87,94,28,248,80,158,36,37,
23,195,2,12,250,22,132,9,77,108,111,97,100,47,117,115,101,45,99,111,109,
112,105,108,101,100,6,25,25,112,97,116,104,32,111,114,32,118,97,108,105,100,
45,112,97,116,104,32,115,116,114,105,110,103,23,197,2,91,159,41,11,90,161,
36,35,11,28,248,22,163,13,23,201,2,23,200,1,27,247,22,191,4,28,23,
193,2,249,22,164,13,23,203,1,23,195,1,200,90,161,38,36,11,248,22,160,
13,23,194,2,87,94,23,196,1,90,161,36,39,11,28,249,22,164,8,23,196,
2,68,114,101,108,97,116,105,118,101,87,94,23,194,1,2,16,23,194,1,90,
161,36,40,11,247,22,181,13,27,89,162,43,36,49,62,122,111,225,7,5,3,
33,27,27,89,162,43,36,51,9,225,8,6,4,33,28,27,249,22,5,89,162,
8,44,36,46,9,223,5,33,29,23,203,2,27,28,23,195,1,27,249,22,5,
89,162,8,44,36,52,9,225,13,11,9,33,30,23,205,2,27,28,23,196,2,
11,193,28,192,192,28,193,28,23,196,2,28,249,22,168,3,248,22,67,196,248,
22,67,23,199,2,193,11,11,11,11,28,23,193,2,249,80,159,47,54,36,202,
89,162,43,35,45,9,224,14,2,33,31,87,94,23,193,1,27,28,23,197,1,
27,249,22,5,83,158,39,20,97,94,89,162,8,44,36,50,9,225,14,12,10,
33,32,23,203,1,23,206,1,27,28,196,11,193,28,192,192,28,193,28,196,28,
249,22,168,3,248,22,67,196,248,22,67,199,193,11,11,11,11,28,192,249,80,
159,48,54,36,203,89,162,43,35,45,9,224,15,2,33,33,249,80,159,48,54,
36,203,89,162,43,35,44,9,224,15,7,33,34,32,36,89,162,8,44,36,54,
2,19,222,33,38,0,17,35,114,120,34,94,40,46,42,63,41,47,40,46,42,
41,36,34,27,249,22,189,13,2,37,23,196,2,28,23,193,2,87,94,23,194,
1,249,22,65,248,22,90,23,196,2,27,248,22,99,23,197,1,27,249,22,189,
13,2,37,23,196,2,28,23,193,2,87,94,23,194,1,249,22,65,248,22,90,
23,196,2,27,248,22,99,23,197,1,27,249,22,189,13,2,37,23,196,2,28,
23,193,2,87,94,23,194,1,249,22,65,248,22,90,23,196,2,248,2,36,248,
22,99,23,197,1,248,22,75,194,248,22,75,194,248,22,75,194,32,39,89,162,
43,36,54,2,19,222,33,40,28,248,22,73,248,22,67,23,195,2,249,22,7,
9,248,22,66,195,91,159,37,11,90,161,37,35,11,27,248,22,67,23,197,2,
28,248,22,73,248,22,67,23,195,2,249,22,7,9,248,22,66,195,91,159,37,
11,90,161,37,35,11,27,248,22,67,23,197,2,28,248,22,73,248,22,67,23,
195,2,249,22,7,9,248,22,66,195,91,159,37,11,90,161,37,35,11,248,2,
39,248,22,67,23,197,2,249,22,7,249,22,65,248,22,66,23,200,1,23,197,
1,195,249,22,7,249,22,65,248,22,66,23,200,1,23,197,1,195,249,22,7,
249,22,65,248,22,66,23,200,1,23,197,1,195,27,248,2,36,23,195,1,28,
194,192,248,2,39,193,87,95,28,248,22,171,4,195,12,250,22,132,9,2,20,
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,87,94,23,193,1,12,27,27,250,
22,139,2,80,159,41,42,37,248,22,145,14,247,22,186,11,11,28,23,193,2,
192,87,94,23,193,1,27,247,22,123,87,94,250,22,137,2,80,159,42,42,37,
248,22,145,14,247,22,186,11,195,192,250,22,137,2,195,198,66,97,116,116,97,
99,104,251,211,197,198,199,10,28,192,250,22,131,9,11,196,195,248,22,129,9,
194,28,249,22,165,6,194,6,1,1,46,2,16,28,249,22,165,6,194,6,2,
2,46,46,62,117,112,192,28,249,22,166,8,248,22,67,23,200,2,23,197,1,
28,249,22,164,8,248,22,66,23,200,2,23,196,1,251,22,129,9,2,20,6,
26,26,99,121,99,108,101,32,105,110,32,108,111,97,100,105,110,103,32,97,116,
32,126,101,58,32,126,101,23,200,1,249,22,2,22,67,248,22,80,249,22,65,
23,206,1,23,202,1,12,12,247,192,20,14,159,80,159,39,44,37,249,22,65,
248,22,145,14,247,22,186,11,23,197,1,20,14,159,80,158,39,39,250,80,158,
42,40,249,22,27,11,80,158,44,39,22,153,4,23,196,1,249,247,22,190,4,
23,198,1,248,22,54,248,22,143,13,23,198,1,87,94,28,28,248,22,139,13,
23,197,2,10,248,22,177,4,23,197,2,12,28,23,198,2,250,22,131,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,132,9,2,20,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,63,23,197,2,249,22,164,
8,248,22,66,23,199,2,2,3,11,248,22,172,4,248,22,90,197,28,28,248,
22,63,23,197,2,249,22,164,8,248,22,66,23,199,2,66,112,108,97,110,101,
116,11,87,94,28,207,12,20,14,159,80,158,37,39,250,80,158,40,40,249,22,
27,11,80,158,42,39,22,186,11,23,197,1,90,161,36,35,10,249,22,154,4,
21,94,2,21,6,18,18,112,108,97,110,101,116,47,114,101,115,111,108,118,101,
114,46,115,115,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,251,211,199,200,201,202,87,94,
23,193,1,27,89,162,8,44,36,45,79,115,104,111,119,45,99,111,108,108,101,
99,116,105,111,110,45,101,114,114,223,6,33,44,27,28,248,22,53,23,199,2,
27,250,22,139,2,80,159,43,43,37,249,22,65,23,204,2,247,22,180,13,11,
28,23,193,2,192,87,94,23,193,1,91,159,37,11,90,161,37,35,11,249,80,
159,44,48,36,248,22,56,23,204,2,11,27,251,80,158,47,50,2,20,23,202,
1,28,248,22,73,23,199,2,23,199,2,248,22,66,23,199,2,28,248,22,73,
23,199,2,9,248,22,67,23,199,2,249,22,157,13,23,195,1,28,248,22,73,
23,197,1,87,94,23,197,1,6,7,7,109,97,105,110,46,115,115,249,22,182,
6,23,199,1,6,3,3,46,115,115,28,248,22,159,6,23,199,2,87,94,23,
194,1,27,248,80,159,41,55,36,23,201,2,27,250,22,139,2,80,159,44,43,
37,249,22,65,23,205,2,23,199,2,11,28,23,193,2,192,87,94,23,193,1,
91,159,37,11,90,161,37,35,11,249,80,159,45,48,36,23,204,2,11,250,22,
1,22,157,13,23,199,1,249,22,79,249,22,2,32,0,89,162,8,44,36,43,
9,222,33,45,23,200,1,248,22,75,23,200,1,28,248,22,139,13,23,199,2,
87,94,23,194,1,28,248,22,162,13,23,199,2,23,198,2,248,22,75,6,26,
26,32,40,97,32,112,97,116,104,32,109,117,115,116,32,98,101,32,97,98,115,
111,108,117,116,101,41,28,249,22,164,8,248,22,66,23,201,2,2,21,27,250,
22,139,2,80,159,43,43,37,249,22,65,23,204,2,247,22,180,13,11,28,23,
193,2,192,87,94,23,193,1,91,159,38,11,90,161,37,35,11,249,80,159,45,
48,36,248,22,90,23,205,2,11,90,161,36,37,11,28,248,22,73,248,22,92,
23,204,2,28,248,22,73,23,194,2,249,22,191,13,0,8,35,114,120,34,91,
46,93,34,23,196,2,11,10,27,27,28,23,197,2,249,22,79,28,248,22,73,
248,22,92,23,208,2,21,93,6,5,5,109,122,108,105,98,249,22,1,22,79,
249,22,2,80,159,51,56,36,248,22,92,23,211,2,23,197,2,28,248,22,73,
23,196,2,248,22,75,23,197,2,23,195,2,251,80,158,49,50,2,20,23,204,
1,248,22,66,23,198,2,248,22,67,23,198,1,249,22,157,13,23,195,1,28,
23,198,1,87,94,23,196,1,23,197,1,28,248,22,73,23,197,1,87,94,23,
197,1,6,7,7,109,97,105,110,46,115,115,28,249,22,191,13,0,8,35,114,
120,34,91,46,93,34,23,199,2,23,197,1,249,22,182,6,23,199,1,6,3,
3,46,115,115,28,249,22,164,8,248,22,66,23,201,2,64,102,105,108,101,249,
22,164,13,248,22,168,13,248,22,90,23,202,2,248,80,159,42,55,36,23,202,
2,12,87,94,28,28,248,22,139,13,23,194,2,10,248,22,181,7,23,194,2,
87,94,23,200,1,12,28,23,200,2,250,22,131,9,67,114,101,113,117,105,114,
101,249,22,143,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,66,23,199,2,6,0,0,23,203,1,87,
94,23,200,1,250,22,132,9,2,20,249,22,143,7,6,13,13,109,111,100,117,
108,101,32,112,97,116,104,126,97,28,23,198,2,248,22,66,23,199,2,6,0,
0,23,201,2,27,28,248,22,181,7,23,195,2,249,22,186,7,23,196,2,35,
249,22,166,13,248,22,167,13,23,197,2,11,27,28,248,22,181,7,23,196,2,
249,22,186,7,23,197,2,36,248,80,158,42,51,23,195,2,91,159,38,11,90,
161,38,35,11,28,248,22,181,7,23,199,2,250,22,7,2,22,249,22,186,7,
23,203,2,37,2,22,248,22,160,13,23,198,2,87,95,23,195,1,23,193,1,
27,28,248,22,181,7,23,200,2,249,22,186,7,23,201,2,38,249,80,158,47,
52,23,197,2,5,0,27,28,248,22,181,7,23,201,2,249,22,186,7,23,202,
2,39,248,22,172,4,23,200,2,27,27,250,22,139,2,80,159,51,42,37,248,
22,145,14,247,22,186,11,11,28,23,193,2,192,87,94,23,193,1,27,247,22,
123,87,94,250,22,137,2,80,159,52,42,37,248,22,145,14,247,22,186,11,195,
192,87,95,28,23,209,1,27,250,22,139,2,23,197,2,197,11,28,23,193,1,
12,87,95,27,27,28,248,22,17,80,159,51,45,37,80,159,50,45,37,247,22,
19,250,22,25,248,22,23,23,197,2,80,159,53,44,37,23,196,1,27,248,22,
145,14,247,22,186,11,249,22,3,83,158,39,20,97,94,89,162,8,44,36,54,
9,226,12,11,2,3,33,46,23,195,1,23,196,1,248,28,248,22,17,80,159,
50,45,37,32,0,89,162,43,36,41,9,222,33,47,80,159,49,57,36,89,162,
43,35,50,9,227,14,9,8,4,3,33,48,250,22,137,2,23,197,1,197,10,
12,28,28,248,22,181,7,23,202,1,11,27,248,22,159,6,23,208,2,28,192,
192,28,248,22,63,23,208,2,249,22,164,8,248,22,66,23,210,2,2,21,11,
250,22,137,2,80,159,50,43,37,28,248,22,159,6,23,210,2,249,22,65,23,
211,1,248,80,159,53,55,36,23,213,1,87,94,23,210,1,249,22,65,23,211,
1,247,22,180,13,252,22,183,7,23,208,1,23,207,1,23,205,1,23,203,1,
201,12,193,91,159,37,10,90,161,36,35,10,11,90,161,36,36,10,83,158,38,
20,96,96,2,20,89,162,8,44,36,50,9,224,2,0,33,42,89,162,43,38,
48,9,223,1,33,43,89,162,43,39,8,30,9,225,2,3,0,33,49,208,87,
95,248,22,152,4,248,80,159,37,49,37,247,22,186,11,248,22,190,4,80,159,
36,36,37,248,22,177,12,80,159,36,41,36,159,35,20,103,159,35,16,1,11,
16,0,83,158,41,20,100,143,66,35,37,98,111,111,116,29,11,11,11,11,10,
10,36,80,158,35,35,20,103,159,39,16,19,2,1,2,2,30,2,4,72,112,
97,116,104,45,115,116,114,105,110,103,63,10,30,2,4,75,112,97,116,104,45,
97,100,100,45,115,117,102,102,105,120,7,30,2,5,1,20,112,97,114,97,109,
101,116,101,114,105,122,97,116,105,111,110,45,107,101,121,4,30,2,5,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,6,2,7,2,8,2,9,2,10,2,11,2,12,2,13,2,14,
30,2,4,69,45,102,105,110,100,45,99,111,108,0,30,2,4,76,110,111,114,
109,97,108,45,99,97,115,101,45,112,97,116,104,6,30,2,4,79,112,97,116,
104,45,114,101,112,108,97,99,101,45,115,117,102,102,105,120,9,2,15,16,0,
11,11,16,0,35,16,0,35,16,11,2,9,2,10,2,7,2,8,2,11,2,
12,2,2,2,6,2,1,2,14,2,13,46,11,11,38,35,11,11,16,1,2,
15,16,1,11,16,1,2,15,36,36,36,11,11,16,0,16,0,16,0,35,35,
11,11,11,16,0,16,0,16,0,35,35,16,0,16,16,83,158,35,16,2,89,
162,43,36,44,9,223,0,33,23,80,159,35,57,36,83,158,35,16,2,89,162,
43,36,44,9,223,0,33,24,80,159,35,56,36,83,158,35,16,2,89,162,43,
36,48,67,103,101,116,45,100,105,114,223,0,33,25,80,159,35,55,36,83,158,
35,16,2,89,162,43,37,48,68,119,105,116,104,45,100,105,114,223,0,33,26,
80,159,35,54,36,83,158,35,16,2,248,22,178,7,69,115,111,45,115,117,102,
102,105,120,80,159,35,35,36,83,158,35,16,2,89,162,43,37,59,2,2,223,
0,33,35,80,159,35,36,36,83,158,35,16,2,32,0,89,162,8,44,36,41,
2,6,222,192,80,159,35,41,36,83,158,35,16,2,247,22,126,80,159,35,42,
36,83,158,35,16,2,247,22,125,80,159,35,43,36,83,158,35,16,2,247,22,
61,80,159,35,44,36,83,158,35,16,2,248,22,18,74,109,111,100,117,108,101,
45,108,111,97,100,105,110,103,80,159,35,45,36,83,158,35,16,2,11,80,158,
35,46,83,158,35,16,2,11,80,158,35,47,83,158,35,16,2,32,0,89,162,
43,37,44,2,13,222,33,41,80,159,35,48,36,83,158,35,16,2,89,162,8,
44,36,44,2,14,223,0,33,50,80,159,35,49,36,83,158,35,16,2,89,162,
43,35,43,2,15,223,0,33,51,80,159,35,53,36,95,29,94,2,3,68,35,
37,107,101,114,110,101,108,11,29,94,2,3,69,35,37,109,105,110,45,115,116,
120,11,2,4,9,9,9,35,0};
EVAL_ONE_SIZED_STR((char *)expr, 4103);
80,158,38,46,87,94,23,195,1,80,158,36,47,27,248,22,173,4,23,197,2,
28,248,22,139,13,23,194,2,91,159,38,11,90,161,38,35,11,248,22,160,13,
23,197,1,87,95,83,160,37,11,80,158,40,46,198,83,160,37,11,80,158,40,
47,192,192,11,11,28,23,193,2,192,87,94,23,193,1,27,247,22,191,4,28,
192,192,247,22,179,13,20,14,159,80,158,35,39,250,80,158,38,40,249,22,27,
11,80,158,40,39,22,191,4,28,248,22,139,13,23,198,2,23,197,1,87,94,
23,197,1,247,22,179,13,247,194,250,22,157,13,23,197,1,23,199,1,249,80,
158,42,38,23,198,1,2,17,252,22,157,13,23,199,1,23,201,1,2,18,247,
22,179,7,249,80,158,44,38,23,200,1,80,159,44,35,37,87,94,23,194,1,
27,250,22,174,13,196,11,32,0,89,162,8,44,35,40,9,222,11,28,192,249,
22,65,195,194,11,27,252,22,157,13,23,200,1,23,202,1,2,18,247,22,179,
7,249,80,158,45,38,23,201,1,80,159,45,35,37,27,250,22,174,13,196,11,
32,0,89,162,8,44,35,40,9,222,11,28,192,249,22,65,195,194,11,249,247,
22,184,13,248,22,66,195,195,27,250,22,157,13,23,198,1,23,200,1,249,80,
158,43,38,23,199,1,2,17,27,250,22,174,13,196,11,32,0,89,162,8,44,
35,40,9,222,11,28,192,249,22,65,195,194,11,249,247,22,189,4,248,22,66,
195,195,249,247,22,189,4,194,195,87,94,28,248,80,158,36,37,23,195,2,12,
250,22,132,9,77,108,111,97,100,47,117,115,101,45,99,111,109,112,105,108,101,
100,6,25,25,112,97,116,104,32,111,114,32,118,97,108,105,100,45,112,97,116,
104,32,115,116,114,105,110,103,23,197,2,91,159,41,11,90,161,36,35,11,28,
248,22,163,13,23,201,2,23,200,1,27,247,22,191,4,28,23,193,2,249,22,
164,13,23,203,1,23,195,1,200,90,161,38,36,11,248,22,160,13,23,194,2,
87,94,23,196,1,90,161,36,39,11,28,249,22,164,8,23,196,2,68,114,101,
108,97,116,105,118,101,87,94,23,194,1,2,16,23,194,1,90,161,36,40,11,
247,22,181,13,27,89,162,43,36,49,62,122,111,225,7,5,3,33,27,27,89,
162,43,36,51,9,225,8,6,4,33,28,27,249,22,5,89,162,8,44,36,46,
9,223,5,33,29,23,203,2,27,28,23,195,1,27,249,22,5,89,162,8,44,
36,52,9,225,13,11,9,33,30,23,205,2,27,28,23,196,2,11,193,28,192,
192,28,193,28,23,196,2,28,249,22,168,3,248,22,67,196,248,22,67,23,199,
2,193,11,11,11,11,28,23,193,2,249,80,159,47,54,36,202,89,162,43,35,
45,9,224,14,2,33,31,87,94,23,193,1,27,28,23,197,1,27,249,22,5,
83,158,39,20,97,94,89,162,8,44,36,50,9,225,14,12,10,33,32,23,203,
1,23,206,1,27,28,196,11,193,28,192,192,28,193,28,196,28,249,22,168,3,
248,22,67,196,248,22,67,199,193,11,11,11,11,28,192,249,80,159,48,54,36,
203,89,162,43,35,45,9,224,15,2,33,33,249,80,159,48,54,36,203,89,162,
43,35,44,9,224,15,7,33,34,32,36,89,162,8,44,36,54,2,19,222,33,
38,0,17,35,114,120,34,94,40,46,42,63,41,47,40,46,42,41,36,34,27,
249,22,189,13,2,37,23,196,2,28,23,193,2,87,94,23,194,1,249,22,65,
248,22,90,23,196,2,27,248,22,99,23,197,1,27,249,22,189,13,2,37,23,
196,2,28,23,193,2,87,94,23,194,1,249,22,65,248,22,90,23,196,2,27,
248,22,99,23,197,1,27,249,22,189,13,2,37,23,196,2,28,23,193,2,87,
94,23,194,1,249,22,65,248,22,90,23,196,2,248,2,36,248,22,99,23,197,
1,248,22,75,194,248,22,75,194,248,22,75,194,32,39,89,162,43,36,54,2,
19,222,33,40,28,248,22,73,248,22,67,23,195,2,249,22,7,9,248,22,66,
195,91,159,37,11,90,161,37,35,11,27,248,22,67,23,197,2,28,248,22,73,
248,22,67,23,195,2,249,22,7,9,248,22,66,195,91,159,37,11,90,161,37,
35,11,27,248,22,67,23,197,2,28,248,22,73,248,22,67,23,195,2,249,22,
7,9,248,22,66,195,91,159,37,11,90,161,37,35,11,248,2,39,248,22,67,
23,197,2,249,22,7,249,22,65,248,22,66,23,200,1,23,197,1,195,249,22,
7,249,22,65,248,22,66,23,200,1,23,197,1,195,249,22,7,249,22,65,248,
22,66,23,200,1,23,197,1,195,27,248,2,36,23,195,1,28,194,192,248,2,
39,193,87,95,28,248,22,171,4,195,12,250,22,132,9,2,20,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,87,94,23,193,1,12,27,27,250,22,139,2,80,
159,41,42,37,248,22,145,14,247,22,186,11,11,28,23,193,2,192,87,94,23,
193,1,27,247,22,123,87,94,250,22,137,2,80,159,42,42,37,248,22,145,14,
247,22,186,11,195,192,250,22,137,2,195,198,66,97,116,116,97,99,104,251,211,
197,198,199,10,28,192,250,22,131,9,11,196,195,248,22,129,9,194,28,249,22,
165,6,194,6,1,1,46,2,16,28,249,22,165,6,194,6,2,2,46,46,62,
117,112,192,28,249,22,166,8,248,22,67,23,200,2,23,197,1,28,249,22,164,
8,248,22,66,23,200,2,23,196,1,251,22,129,9,2,20,6,26,26,99,121,
99,108,101,32,105,110,32,108,111,97,100,105,110,103,32,97,116,32,126,101,58,
32,126,101,23,200,1,249,22,2,22,67,248,22,80,249,22,65,23,206,1,23,
202,1,12,12,247,192,20,14,159,80,159,39,44,37,249,22,65,248,22,145,14,
247,22,186,11,23,197,1,20,14,159,80,158,39,39,250,80,158,42,40,249,22,
27,11,80,158,44,39,22,153,4,23,196,1,249,247,22,190,4,23,198,1,248,
22,54,248,22,143,13,23,198,1,87,94,28,28,248,22,139,13,23,197,2,10,
248,22,177,4,23,197,2,12,28,23,198,2,250,22,131,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,132,9,
2,20,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,63,23,197,2,249,22,164,8,248,22,66,
23,199,2,2,3,11,248,22,172,4,248,22,90,197,28,28,248,22,63,23,197,
2,249,22,164,8,248,22,66,23,199,2,66,112,108,97,110,101,116,11,87,94,
28,207,12,20,14,159,80,158,37,39,250,80,158,40,40,249,22,27,11,80,158,
42,39,22,186,11,23,197,1,90,161,36,35,10,249,22,154,4,21,94,2,21,
6,18,18,112,108,97,110,101,116,47,114,101,115,111,108,118,101,114,46,115,115,
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,251,211,199,200,201,202,87,94,23,193,1,27,
89,162,8,44,36,45,79,115,104,111,119,45,99,111,108,108,101,99,116,105,111,
110,45,101,114,114,223,6,33,44,27,28,248,22,53,23,199,2,27,250,22,139,
2,80,159,43,43,37,249,22,65,23,204,2,247,22,180,13,11,28,23,193,2,
192,87,94,23,193,1,91,159,37,11,90,161,37,35,11,249,80,159,44,48,36,
248,22,56,23,204,2,11,27,251,80,158,47,50,2,20,23,202,1,28,248,22,
73,23,199,2,23,199,2,248,22,66,23,199,2,28,248,22,73,23,199,2,9,
248,22,67,23,199,2,249,22,157,13,23,195,1,28,248,22,73,23,197,1,87,
94,23,197,1,6,7,7,109,97,105,110,46,115,115,249,22,182,6,23,199,1,
6,3,3,46,115,115,28,248,22,159,6,23,199,2,87,94,23,194,1,27,248,
80,159,41,55,36,23,201,2,27,250,22,139,2,80,159,44,43,37,249,22,65,
23,205,2,23,199,2,11,28,23,193,2,192,87,94,23,193,1,91,159,37,11,
90,161,37,35,11,249,80,159,45,48,36,23,204,2,11,250,22,1,22,157,13,
23,199,1,249,22,79,249,22,2,32,0,89,162,8,44,36,43,9,222,33,45,
23,200,1,248,22,75,23,200,1,28,248,22,139,13,23,199,2,87,94,23,194,
1,28,248,22,162,13,23,199,2,23,198,2,248,22,75,6,26,26,32,40,97,
32,112,97,116,104,32,109,117,115,116,32,98,101,32,97,98,115,111,108,117,116,
101,41,28,249,22,164,8,248,22,66,23,201,2,2,21,27,250,22,139,2,80,
159,43,43,37,249,22,65,23,204,2,247,22,180,13,11,28,23,193,2,192,87,
94,23,193,1,91,159,38,11,90,161,37,35,11,249,80,159,45,48,36,248,22,
90,23,205,2,11,90,161,36,37,11,28,248,22,73,248,22,92,23,204,2,28,
248,22,73,23,194,2,249,22,191,13,0,8,35,114,120,34,91,46,93,34,23,
196,2,11,10,27,27,28,23,197,2,249,22,79,28,248,22,73,248,22,92,23,
208,2,21,93,6,5,5,109,122,108,105,98,249,22,1,22,79,249,22,2,80,
159,51,56,36,248,22,92,23,211,2,23,197,2,28,248,22,73,23,196,2,248,
22,75,23,197,2,23,195,2,251,80,158,49,50,2,20,23,204,1,248,22,66,
23,198,2,248,22,67,23,198,1,249,22,157,13,23,195,1,28,23,198,1,87,
94,23,196,1,23,197,1,28,248,22,73,23,197,1,87,94,23,197,1,6,7,
7,109,97,105,110,46,115,115,28,249,22,191,13,0,8,35,114,120,34,91,46,
93,34,23,199,2,23,197,1,249,22,182,6,23,199,1,6,3,3,46,115,115,
28,249,22,164,8,248,22,66,23,201,2,64,102,105,108,101,249,22,164,13,248,
22,168,13,248,22,90,23,202,2,248,80,159,42,55,36,23,202,2,12,87,94,
28,28,248,22,139,13,23,194,2,10,248,22,181,7,23,194,2,87,94,23,200,
1,12,28,23,200,2,250,22,131,9,67,114,101,113,117,105,114,101,249,22,143,
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,66,23,199,2,6,0,0,23,203,1,87,94,23,200,1,
250,22,132,9,2,20,249,22,143,7,6,13,13,109,111,100,117,108,101,32,112,
97,116,104,126,97,28,23,198,2,248,22,66,23,199,2,6,0,0,23,201,2,
27,28,248,22,181,7,23,195,2,249,22,186,7,23,196,2,35,249,22,166,13,
248,22,167,13,23,197,2,11,27,28,248,22,181,7,23,196,2,249,22,186,7,
23,197,2,36,248,80,158,42,51,23,195,2,91,159,38,11,90,161,38,35,11,
28,248,22,181,7,23,199,2,250,22,7,2,22,249,22,186,7,23,203,2,37,
2,22,248,22,160,13,23,198,2,87,95,23,195,1,23,193,1,27,28,248,22,
181,7,23,200,2,249,22,186,7,23,201,2,38,249,80,158,47,52,23,197,2,
5,0,27,28,248,22,181,7,23,201,2,249,22,186,7,23,202,2,39,248,22,
172,4,23,200,2,27,27,250,22,139,2,80,159,51,42,37,248,22,145,14,247,
22,186,11,11,28,23,193,2,192,87,94,23,193,1,27,247,22,123,87,94,250,
22,137,2,80,159,52,42,37,248,22,145,14,247,22,186,11,195,192,87,95,28,
23,209,1,27,250,22,139,2,23,197,2,197,11,28,23,193,1,12,87,95,27,
27,28,248,22,17,80,159,51,45,37,80,159,50,45,37,247,22,19,250,22,25,
248,22,23,23,197,2,80,159,53,44,37,23,196,1,27,248,22,145,14,247,22,
186,11,249,22,3,83,158,39,20,97,94,89,162,8,44,36,54,9,226,12,11,
2,3,33,46,23,195,1,23,196,1,248,28,248,22,17,80,159,50,45,37,32,
0,89,162,43,36,41,9,222,33,47,80,159,49,57,36,89,162,43,35,50,9,
227,14,9,8,4,3,33,48,250,22,137,2,23,197,1,197,10,12,28,28,248,
22,181,7,23,202,1,11,27,248,22,159,6,23,208,2,28,192,192,28,248,22,
63,23,208,2,249,22,164,8,248,22,66,23,210,2,2,21,11,250,22,137,2,
80,159,50,43,37,28,248,22,159,6,23,210,2,249,22,65,23,211,1,248,80,
159,53,55,36,23,213,1,87,94,23,210,1,249,22,65,23,211,1,247,22,180,
13,252,22,183,7,23,208,1,23,207,1,23,205,1,23,203,1,201,12,193,91,
159,37,10,90,161,36,35,10,11,90,161,36,36,10,83,158,38,20,96,96,2,
20,89,162,8,44,36,50,9,224,2,0,33,42,89,162,43,38,48,9,223,1,
33,43,89,162,43,39,8,30,9,225,2,3,0,33,49,208,87,95,248,22,152,
4,248,80,159,37,49,37,247,22,186,11,248,22,190,4,80,159,36,36,37,248,
22,177,12,80,159,36,41,36,159,35,20,103,159,35,16,1,11,16,0,83,158,
41,20,100,143,66,35,37,98,111,111,116,29,11,11,11,11,10,10,36,80,158,
35,35,20,103,159,39,16,19,2,1,2,2,30,2,4,72,112,97,116,104,45,
115,116,114,105,110,103,63,10,30,2,4,75,112,97,116,104,45,97,100,100,45,
115,117,102,102,105,120,7,30,2,5,1,20,112,97,114,97,109,101,116,101,114,
105,122,97,116,105,111,110,45,107,101,121,4,30,2,5,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,
6,2,7,2,8,2,9,2,10,2,11,2,12,2,13,2,14,30,2,4,69,
45,102,105,110,100,45,99,111,108,0,30,2,4,76,110,111,114,109,97,108,45,
99,97,115,101,45,112,97,116,104,6,30,2,4,79,112,97,116,104,45,114,101,
112,108,97,99,101,45,115,117,102,102,105,120,9,2,15,16,0,11,11,16,0,
35,16,0,35,16,11,2,9,2,10,2,7,2,8,2,11,2,12,2,2,2,
6,2,1,2,14,2,13,46,11,11,38,35,11,11,16,1,2,15,16,1,11,
16,1,2,15,36,36,36,11,11,16,0,16,0,16,0,35,35,11,11,11,16,
0,16,0,16,0,35,35,16,0,16,16,83,158,35,16,2,89,162,43,36,44,
9,223,0,33,23,80,159,35,57,36,83,158,35,16,2,89,162,43,36,44,9,
223,0,33,24,80,159,35,56,36,83,158,35,16,2,89,162,43,36,48,67,103,
101,116,45,100,105,114,223,0,33,25,80,159,35,55,36,83,158,35,16,2,89,
162,43,37,48,68,119,105,116,104,45,100,105,114,223,0,33,26,80,159,35,54,
36,83,158,35,16,2,248,22,178,7,69,115,111,45,115,117,102,102,105,120,80,
159,35,35,36,83,158,35,16,2,89,162,43,37,59,2,2,223,0,33,35,80,
159,35,36,36,83,158,35,16,2,32,0,89,162,8,44,36,41,2,6,222,192,
80,159,35,41,36,83,158,35,16,2,247,22,126,80,159,35,42,36,83,158,35,
16,2,247,22,125,80,159,35,43,36,83,158,35,16,2,247,22,61,80,159,35,
44,36,83,158,35,16,2,248,22,18,74,109,111,100,117,108,101,45,108,111,97,
100,105,110,103,80,159,35,45,36,83,158,35,16,2,11,80,158,35,46,83,158,
35,16,2,11,80,158,35,47,83,158,35,16,2,32,0,89,162,43,37,44,2,
13,222,33,41,80,159,35,48,36,83,158,35,16,2,89,162,8,44,36,44,2,
14,223,0,33,50,80,159,35,49,36,83,158,35,16,2,89,162,43,35,43,2,
15,223,0,33,51,80,159,35,53,36,95,29,94,2,3,68,35,37,107,101,114,
110,101,108,11,29,94,2,3,69,35,37,109,105,110,45,115,116,120,11,2,4,
9,9,9,35,0};
EVAL_ONE_SIZED_STR((char *)expr, 4099);
}

View File

@ -1171,6 +1171,22 @@ void scheme_shadow(Scheme_Env *env, Scheme_Object *n, int stxtoo)
} else {
if (env->shadowed_syntax)
scheme_hash_set(env->shadowed_syntax, n, NULL);
if (rn) {
/* If the syntax binding is a rename transformer, need to install
a mapping. */
Scheme_Object *v;
v = scheme_lookup_in_table(env->syntax, (const char *)n);
if (v) {
v = SCHEME_PTR_VAL(v);
if (SAME_TYPE(SCHEME_TYPE(v), scheme_id_macro_type)) {
scheme_install_free_id_rename(n,
SCHEME_PTR1_VAL(v),
rn,
scheme_make_integer(env->phase));
}
}
}
}
}
@ -1959,7 +1975,8 @@ Scheme_Object *scheme_tl_id_sym(Scheme_Env *env, Scheme_Object *id, Scheme_Objec
existing rename. */
if (!SCHEME_HASHTP((Scheme_Object *)env) && env->module && (mode < 2)) {
Scheme_Object *mod, *nm = id;
mod = scheme_stx_module_name(&nm, scheme_make_integer(env->phase), NULL, NULL, NULL, NULL, NULL);
mod = scheme_stx_module_name(0, &nm, scheme_make_integer(env->phase), NULL, NULL, NULL,
NULL, NULL, NULL, NULL);
if (mod /* must refer to env->module, otherwise there would
have been an error before getting here */
&& NOT_SAME_OBJ(nm, sym))
@ -2634,7 +2651,8 @@ scheme_lookup_binding(Scheme_Object *find_id, Scheme_Comp_Env *env, int flags,
}
src_find_id = find_id;
modidx = scheme_stx_module_name(&find_id, scheme_make_integer(phase), NULL, NULL, &mod_defn_phase, NULL, NULL);
modidx = scheme_stx_module_name(0, &find_id, scheme_make_integer(phase), NULL, NULL, &mod_defn_phase,
NULL, NULL, NULL, NULL);
/* Used out of context? */
if (SAME_OBJ(modidx, scheme_undefined)) {
@ -2646,9 +2664,10 @@ scheme_lookup_binding(Scheme_Object *find_id, Scheme_Comp_Env *env, int flags,
}
if (modidx) {
if (!(flags & SCHEME_OUT_OF_CONTEXT_OK))
if (!(flags & SCHEME_OUT_OF_CONTEXT_OK)) {
scheme_wrong_syntax(scheme_compile_stx_string, NULL, find_id,
"identifier used out of context");
}
if (flags & SCHEME_OUT_OF_CONTEXT_LOCAL)
return scheme_make_local(scheme_local_type, 0, 0);
return NULL;
@ -2910,7 +2929,8 @@ int scheme_check_context(Scheme_Env *env, Scheme_Object *name, Scheme_Object *ok
if (mod && SCHEME_TRUEP(mod) && NOT_SAME_OBJ(ok_modidx, mod)) {
return 1;
} else {
mod = scheme_stx_module_name(&id, scheme_make_integer(env->phase), NULL, NULL, NULL, NULL, NULL);
mod = scheme_stx_module_name(0, &id, scheme_make_integer(env->phase), NULL, NULL, NULL,
NULL, NULL, NULL, NULL);
if (SAME_OBJ(mod, scheme_undefined))
return 1;
}

View File

@ -661,6 +661,9 @@ call_error(char *buffer, int len, Scheme_Object *exn)
scheme_optimize_context_to_string(scheme_current_thread->constant_folding),
buffer);
scheme_longjmp(scheme_error_buf, 1);
} else if (scheme_current_thread->reading_delayed) {
scheme_current_thread->reading_delayed = exn;
scheme_longjmp(scheme_error_buf, 1);
} else {
mz_jmp_buf savebuf;
Scheme_Object *p[2], *display_handler, *escape_handler, *v;
@ -1592,7 +1595,8 @@ static void do_wrong_syntax(const char *where,
if (scheme_current_thread->current_local_env)
phase = scheme_current_thread->current_local_env->genv->phase;
else phase = 0;
scheme_stx_module_name(&first, scheme_make_integer(phase), &mod, &nomwho, NULL, NULL, NULL);
scheme_stx_module_name(0, &first, scheme_make_integer(phase), &mod, &nomwho,
NULL, NULL, NULL, NULL, NULL);
}
}
} else {

View File

@ -6070,7 +6070,8 @@ static Scheme_Object *check_top(const char *when, Scheme_Object *form, Scheme_Co
if (NOT_SAME_OBJ(tl_id, SCHEME_STX_SYM(symbol))) {
/* Since the module has a rename for this id, it's certainly defined. */
} else {
modidx = scheme_stx_module_name(&symbol, scheme_make_integer(env->genv->phase), NULL, NULL, NULL, NULL, NULL);
modidx = scheme_stx_module_name(0, &symbol, scheme_make_integer(env->genv->phase), NULL, NULL, NULL,
NULL, NULL, NULL, NULL);
if (modidx) {
/* If it's an access path, resolve it: */
if (env->genv->module
@ -6535,7 +6536,7 @@ scheme_compile_expand_block(Scheme_Object *forms, Scheme_Comp_Env *env,
names, expr,
new_env->genv->exp_env, new_env->insp, rec, drec,
new_env, new_env,
&pos);
&pos, rib);
}
/* Remember extended environment */
@ -9800,7 +9801,7 @@ local_eval(int argc, Scheme_Object **argv)
scheme_bind_syntaxes("local syntax definition", names, expr,
stx_env->genv->exp_env, stx_env->insp, &rec, 0,
stx_env, stx_env,
&pos);
&pos, rib);
}
/* Extend shared rib with renamings */

View File

@ -116,7 +116,8 @@ static void eval_exptime(Scheme_Object *names, int count,
Scheme_Env *genv, Scheme_Comp_Env *env,
Resolve_Prefix *rp, int let_depth, int shift,
Scheme_Bucket_Table *syntax, int for_stx,
Scheme_Object *certs);
Scheme_Object *certs,
Scheme_Object *free_id_rename_rn);
static Scheme_Module_Exports *make_module_exports();
@ -3947,7 +3948,7 @@ void scheme_run_module_exptime(Scheme_Env *menv, int set_ns)
eval_exptime(names, scheme_list_length(names), e, exp_env, rhs_env,
rp, let_depth, 1, (for_stx ? for_stx_globals : syntax), for_stx,
NULL);
NULL, scheme_false);
}
if (set_ns) {
@ -4401,13 +4402,15 @@ static void *eval_exptime_k(void)
Resolve_Prefix *rp;
int let_depth, shift;
Scheme_Bucket_Table *syntax;
Scheme_Object *free_id_rename_rn;
names = (Scheme_Object *)p->ku.k.p1;
expr = (Scheme_Object *)p->ku.k.p2;
genv = (Scheme_Env *)SCHEME_CAR((Scheme_Object *)p->ku.k.p3);
comp_env = (Scheme_Comp_Env *)SCHEME_CDR((Scheme_Object *)p->ku.k.p3);
rp = (Resolve_Prefix *)SCHEME_CAR((Scheme_Object *)p->ku.k.p4);
syntax = (Scheme_Bucket_Table *)SCHEME_CDR((Scheme_Object *)p->ku.k.p4);
free_id_rename_rn = SCHEME_CAR((Scheme_Object *)p->ku.k.p4);
rp = (Resolve_Prefix *)SCHEME_CAR(SCHEME_CDR((Scheme_Object *)p->ku.k.p4));
syntax = (Scheme_Bucket_Table *)SCHEME_CDR(SCHEME_CDR((Scheme_Object *)p->ku.k.p4));
count = p->ku.k.i1;
let_depth = p->ku.k.i2;
shift = p->ku.k.i3;
@ -4420,7 +4423,8 @@ static void *eval_exptime_k(void)
p->ku.k.p4 = NULL;
p->ku.k.p5 = NULL;
eval_exptime(names, count, expr, genv, comp_env, rp, let_depth, shift, syntax, for_stx, certs);
eval_exptime(names, count, expr, genv, comp_env, rp, let_depth, shift, syntax, for_stx,
certs, free_id_rename_rn);
return NULL;
}
@ -4441,7 +4445,8 @@ static void eval_exptime(Scheme_Object *names, int count,
Scheme_Env *genv, Scheme_Comp_Env *comp_env,
Resolve_Prefix *rp,
int let_depth, int shift, Scheme_Bucket_Table *syntax,
int for_stx, Scheme_Object *certs)
int for_stx, Scheme_Object *certs,
Scheme_Object *free_id_rename_rn)
{
Scheme_Object *macro, *vals, *name, **save_runstack;
int i, g, depth;
@ -4454,6 +4459,7 @@ static void eval_exptime(Scheme_Object *names, int count,
vals = scheme_make_pair((Scheme_Object *)genv, (Scheme_Object *)comp_env);
p->ku.k.p3 = vals;
vals = scheme_make_pair((Scheme_Object *)rp, (Scheme_Object *)syntax);
vals = scheme_make_pair(free_id_rename_rn, vals);
p->ku.k.p4 = vals;
p->ku.k.i1 = count;
p->ku.k.i2 = let_depth;
@ -4511,6 +4517,11 @@ static void eval_exptime(Scheme_Object *names, int count,
macro = scheme_alloc_small_object();
macro->type = scheme_macro_type;
SCHEME_PTR_VAL(macro) = values[i];
if (SCHEME_TRUEP(free_id_rename_rn)
&& SAME_TYPE(SCHEME_TYPE(values[i]), scheme_id_macro_type))
scheme_install_free_id_rename(name, SCHEME_PTR1_VAL(values[i]), free_id_rename_rn,
scheme_make_integer(0));
} else
macro = values[i];
@ -4526,6 +4537,11 @@ static void eval_exptime(Scheme_Object *names, int count,
macro = scheme_alloc_small_object();
macro->type = scheme_macro_type;
SCHEME_PTR_VAL(macro) = vals;
if (SCHEME_TRUEP(free_id_rename_rn)
&& SAME_TYPE(SCHEME_TYPE(vals), scheme_id_macro_type))
scheme_install_free_id_rename(name, SCHEME_PTR1_VAL(vals), free_id_rename_rn,
scheme_make_integer(0));
} else
macro = vals;
@ -6170,6 +6186,7 @@ static Scheme_Object *do_module_begin(Scheme_Object *form, Scheme_Comp_Env *env,
Optimize_Info *oi;
int count = 0;
int for_stx;
int use_post_ex = 0;
for_stx = scheme_stx_module_eq(define_for_syntaxes_stx, fst, 0);
@ -6233,6 +6250,7 @@ static Scheme_Object *do_module_begin(Scheme_Object *form, Scheme_Comp_Env *env,
scheme_extend_module_rename(for_stx ? post_ex_et_rn : post_ex_rn, self_modidx, name, name, self_modidx, name,
for_stx ? 1 : 0, NULL, NULL, 0);
*all_simple_renames = 0;
use_post_ex = 1;
} else
scheme_extend_module_rename(for_stx ? et_rn : rn, self_modidx, name, name, self_modidx, name,
for_stx ? 1 : 0, NULL, NULL, 0);
@ -6304,8 +6322,9 @@ static Scheme_Object *do_module_begin(Scheme_Object *form, Scheme_Comp_Env *env,
eval_exptime(names, count, m, eenv->genv, rhs_env, rp, ri->max_let_depth, 0,
(for_stx ? env->genv->exp_env->toplevel : env->genv->syntax), for_stx,
rec[drec].certs);
rec[drec].certs,
for_stx ? scheme_false : (use_post_ex ? post_ex_rn : rn));
if (rec[drec].comp)
e = NULL;
else {
@ -6369,11 +6388,11 @@ static Scheme_Object *do_module_begin(Scheme_Object *form, Scheme_Comp_Env *env,
}
/* first = a list of (cons semi-expanded-expression kind) */
/* Bound names will be re-bound at this point: */
/* Bound names will not be re-bound at this point: */
if (rec[drec].comp || (rec[drec].depth != -2)) {
scheme_seal_module_rename_set(rn_set, STX_SEAL_BOUND);
scheme_seal_module_rename_set(post_ex_rn_set, STX_SEAL_BOUND);
}
scheme_seal_module_rename_set(post_ex_rn_set, STX_SEAL_BOUND);
/* Pass 2 */
SCHEME_EXPAND_OBSERVE_NEXT_GROUP(observer);
@ -6534,8 +6553,8 @@ static Scheme_Object *do_module_begin(Scheme_Object *form, Scheme_Comp_Env *env,
if (rec[drec].comp || (rec[drec].depth != -2)) {
scheme_seal_module_rename_set(rn_set, STX_SEAL_ALL);
scheme_seal_module_rename_set(post_ex_rn_set, STX_SEAL_ALL);
}
scheme_seal_module_rename_set(post_ex_rn_set, STX_SEAL_ALL);
/* Compute provides for re-provides and all-defs-out: */
reprovide_kernel = compute_reprovides(all_provided,
@ -8441,7 +8460,7 @@ void add_single_require(Scheme_Module_Exports *me, /* from module */
exets ? exets[j] : 0,
src_phase_index,
pt->phase_index,
for_unmarshal || (!has_context && can_save_marshal));
(for_unmarshal || (!has_context && can_save_marshal)) ? 1 : 0);
}
}
}

View File

@ -1649,6 +1649,7 @@ static int thread_val_MARK(void *p) {
gcMARK(pr->current_mt);
gcMARK(pr->constant_folding);
gcMARK(pr->reading_delayed);
gcMARK(pr->overflow_reply);
@ -1759,6 +1760,7 @@ static int thread_val_FIXUP(void *p) {
gcFIXUP(pr->current_mt);
gcFIXUP(pr->constant_folding);
gcFIXUP(pr->reading_delayed);
gcFIXUP(pr->overflow_reply);
@ -5036,6 +5038,7 @@ static int mark_rename_table_MARK(void *p) {
gcMARK(rn->plus_kernel_nominal_source);
gcMARK(rn->set_identity);
gcMARK(rn->marked_names);
gcMARK(rn->free_id_renames);
return
gcBYTES_TO_WORDS(sizeof(Module_Renames));
}
@ -5050,6 +5053,7 @@ static int mark_rename_table_FIXUP(void *p) {
gcFIXUP(rn->plus_kernel_nominal_source);
gcFIXUP(rn->set_identity);
gcFIXUP(rn->marked_names);
gcFIXUP(rn->free_id_renames);
return
gcBYTES_TO_WORDS(sizeof(Module_Renames));
}

View File

@ -662,6 +662,7 @@ thread_val {
gcMARK(pr->current_mt);
gcMARK(pr->constant_folding);
gcMARK(pr->reading_delayed);
gcMARK(pr->overflow_reply);
@ -2068,6 +2069,7 @@ mark_rename_table {
gcMARK(rn->plus_kernel_nominal_source);
gcMARK(rn->set_identity);
gcMARK(rn->marked_names);
gcMARK(rn->free_id_renames);
size:
gcBYTES_TO_WORDS(sizeof(Module_Renames));
}

View File

@ -120,6 +120,8 @@ static Scheme_Object *writable_struct_subs(Scheme_Object *s, int for_write, Prin
#define PRINTABLE_STRUCT(obj, pp) (scheme_inspector_sees_part(obj, pp->inspector, -1))
#define SCHEME_PREFABP(obj) (((Scheme_Structure *)(obj))->stype->prefab_key)
#define SCHEME_HASHTPx(obj) ((SCHEME_HASHTP(obj) && !(MZ_OPT_HASH_KEY(&(((Scheme_Hash_Table *)obj)->iso)) & 0x1)))
#define HAS_SUBSTRUCT(obj, qk) \
(SCHEME_PAIRP(obj) \
|| SCHEME_MUTABLE_PAIRP(obj) \
@ -129,7 +131,7 @@ static Scheme_Object *writable_struct_subs(Scheme_Object *s, int for_write, Prin
&& SCHEME_STRUCTP(obj) \
&& PRINTABLE_STRUCT(obj, pp), 0)) \
|| (qk(SCHEME_STRUCTP(obj) && scheme_is_writable_struct(obj), 0)) \
|| (qk(pp->print_hash_table, 1) && (SCHEME_HASHTP(obj) || SCHEME_HASHTRP(obj))))
|| (qk(pp->print_hash_table, 1) && (SCHEME_HASHTPx(obj) || SCHEME_HASHTRP(obj))))
#define ssQUICK(x, isbox) x
#define ssQUICKp(x, isbox) (pp ? x : isbox)
#define ssALL(x, isbox) 1
@ -486,7 +488,7 @@ static int check_cycles(Scheme_Object *obj, int for_write, Scheme_Hash_Table *ht
}
}
}
} else if (SCHEME_HASHTP(obj)) {
} else if (SCHEME_HASHTPx(obj)) {
/* got here => printable */
Scheme_Hash_Table *t;
Scheme_Object **keys, **vals, *val;
@ -591,7 +593,7 @@ static int check_cycles_fast(Scheme_Object *obj, PrintParams *pp, int *fast_chec
} else
cycle = 0;
} else if (pp->print_hash_table
&& SCHEME_HASHTP(obj)) {
&& SCHEME_HASHTPx(obj)) {
if (!((Scheme_Hash_Table *)obj)->count)
cycle = 0;
else
@ -702,7 +704,7 @@ static void setup_graph_table(Scheme_Object *obj, int for_write, Scheme_Hash_Tab
setup_graph_table(((Scheme_Structure *)obj)->slots[i], for_write, ht, counter, pp);
}
}
} else if (pp && SCHEME_HASHTP(obj)) { /* got here => printable */
} else if (pp && SCHEME_HASHTPx(obj)) { /* got here => printable */
Scheme_Hash_Table *t;
Scheme_Object **keys, **vals, *val;
int i;
@ -1831,7 +1833,7 @@ print(Scheme_Object *obj, int notdisplay, int compact, Scheme_Hash_Table *ht,
}
}
else if ((compact || pp->print_hash_table)
&& (SCHEME_HASHTP(obj) || SCHEME_HASHTRP(obj)))
&& (SCHEME_HASHTPx(obj) || SCHEME_HASHTRP(obj)))
{
Scheme_Hash_Table *t;
Scheme_Hash_Tree *tr;
@ -1918,6 +1920,12 @@ print(Scheme_Object *obj, int notdisplay, int compact, Scheme_Hash_Table *ht,
closed = 1;
}
else if (compact && SCHEME_HASHTP(obj))
{
/* since previous case didn't catch this table, it has a 0x1 flag
and should be marshalled as #t */
print_compact(pp, CPT_TRUE);
}
else if (SAME_OBJ(obj, scheme_true))
{
if (compact)

View File

@ -5322,6 +5322,7 @@ Scheme_Object *scheme_load_delayed_code(int _which, Scheme_Load_Delay *_delay_in
unsigned char *st;
Scheme_Object * volatile port;
Scheme_Object * volatile v;
Scheme_Object * volatile v_exn;
Scheme_Hash_Table ** volatile ht;
mz_jmp_buf newbuf, * volatile savebuf;
@ -5417,12 +5418,16 @@ Scheme_Object *scheme_load_delayed_code(int _which, Scheme_Load_Delay *_delay_in
/* Perform the read, catching escapes so we can clean up: */
savebuf = scheme_current_thread->error_buf;
scheme_current_thread->error_buf = &newbuf;
scheme_current_thread->reading_delayed = scheme_true;
if (scheme_setjmp(newbuf)) {
v = NULL;
v_exn = scheme_current_thread->reading_delayed;
} else {
v = read_compact(rp, 0);
v_exn = NULL;
}
scheme_current_thread->error_buf = savebuf;
scheme_current_thread->reading_delayed = NULL;
/* Clean up: */
@ -5452,6 +5457,8 @@ Scheme_Object *scheme_load_delayed_code(int _which, Scheme_Load_Delay *_delay_in
return v;
} else {
if (v_exn)
scheme_raise(v_exn);
scheme_longjmp(*scheme_current_thread->error_buf, 1);
return NULL;
}

View File

@ -743,6 +743,11 @@ Scheme_Object *scheme_stx_remove_extra_marks(Scheme_Object *o, Scheme_Object *re
Scheme_Object *scheme_syntax_make_transfer_intro(int argc, Scheme_Object **argv);
void scheme_install_free_id_rename(Scheme_Object *id,
Scheme_Object *orig_id,
Scheme_Object *rename_rib,
Scheme_Object *phase);
#define mzMOD_RENAME_TOPLEVEL 0
#define mzMOD_RENAME_NORMAL 1
#define mzMOD_RENAME_MARKED 2
@ -763,11 +768,11 @@ void scheme_seal_module_rename_set(Scheme_Object *rns, int level);
#define STX_SEAL_ALL 2
Scheme_Object *scheme_make_module_rename(Scheme_Object *phase, int kind, Scheme_Hash_Table *mns);
void scheme_extend_module_rename(Scheme_Object *rn, Scheme_Object *modname,
Scheme_Object *locname, Scheme_Object *exname,
Scheme_Object *nominal_src, Scheme_Object *nominal_ex,
int mod_phase, Scheme_Object *src_phase_index,
Scheme_Object *nom_export_phase, int drop_for_marshal);
Scheme_Object* scheme_extend_module_rename(Scheme_Object *rn, Scheme_Object *modname,
Scheme_Object *locname, Scheme_Object *exname,
Scheme_Object *nominal_src, Scheme_Object *nominal_ex,
int mod_phase, Scheme_Object *src_phase_index,
Scheme_Object *nom_export_phase, int drop_for_marshal);
void scheme_extend_module_rename_with_shared(Scheme_Object *rn, Scheme_Object *modidx,
struct Scheme_Module_Phase_Exports *pt,
Scheme_Object *unmarshal_phase_index,
@ -797,12 +802,15 @@ Scheme_Object *scheme_flatten_syntax_list(Scheme_Object *lst, int *islist);
int scheme_stx_module_eq(Scheme_Object *a, Scheme_Object *b, long phase);
int scheme_stx_module_eq2(Scheme_Object *a, Scheme_Object *b, Scheme_Object *phase, Scheme_Object *asym);
Scheme_Object *scheme_stx_get_module_eq_sym(Scheme_Object *a, Scheme_Object *phase);
Scheme_Object *scheme_stx_module_name(Scheme_Object **name, Scheme_Object *phase,
Scheme_Object *scheme_stx_module_name(int recur,
Scheme_Object **name, Scheme_Object *phase,
Scheme_Object **nominal_modidx,
Scheme_Object **nominal_name,
Scheme_Object **mod_phase,
Scheme_Object **src_phase_index,
Scheme_Object **nominal_src_phase);
Scheme_Object **nominal_src_phase,
Scheme_Object **lex_env,
int *_sealed);
Scheme_Object *scheme_stx_moduleless_env(Scheme_Object *a);
int scheme_stx_parallel_is_used(Scheme_Object *sym, Scheme_Object *stx);
@ -2111,7 +2119,7 @@ void scheme_bind_syntaxes(const char *where, Scheme_Object *names, Scheme_Object
Scheme_Env *exp_env, Scheme_Object *insp,
Scheme_Compile_Expand_Info *rec, int drec,
Scheme_Comp_Env *stx_env, Scheme_Comp_Env *rhs_env,
int *_pos);
int *_pos, Scheme_Object *rename_rib);
int scheme_is_sub_env(Scheme_Comp_Env *stx_env, Scheme_Comp_Env *env);
typedef struct SFS_Info {

View File

@ -13,12 +13,12 @@
consistently.)
*/
#define MZSCHEME_VERSION "4.1.5.1"
#define MZSCHEME_VERSION "4.1.5.2"
#define MZSCHEME_VERSION_X 4
#define MZSCHEME_VERSION_Y 1
#define MZSCHEME_VERSION_Z 5
#define MZSCHEME_VERSION_W 1
#define MZSCHEME_VERSION_W 2
#define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
#define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)

File diff suppressed because it is too large Load Diff

View File

@ -5737,7 +5737,7 @@ void scheme_bind_syntaxes(const char *where, Scheme_Object *names, Scheme_Object
Scheme_Env *exp_env, Scheme_Object *insp,
Scheme_Compile_Expand_Info *rec, int drec,
Scheme_Comp_Env *stx_env, Scheme_Comp_Env *rhs_env,
int *_pos)
int *_pos, Scheme_Object *rename_rib)
{
Scheme_Object **results, *l;
Scheme_Comp_Env *eenv;
@ -5841,10 +5841,16 @@ void scheme_bind_syntaxes(const char *where, Scheme_Object *names, Scheme_Object
macro->type = scheme_macro_type;
if (vc == 1)
SCHEME_PTR_VAL(macro) = a;
else
else
SCHEME_PTR_VAL(macro) = results[j];
scheme_set_local_syntax(i++, name, macro, stx_env);
if (SAME_TYPE(SCHEME_TYPE(SCHEME_PTR_VAL(macro)), scheme_id_macro_type)) {
/* Install a free-id=? rename */
scheme_install_free_id_rename(name, SCHEME_PTR1_VAL(SCHEME_PTR_VAL(macro)), rename_rib,
scheme_make_integer(rhs_env->genv->phase));
}
}
*_pos = i;
@ -6033,7 +6039,7 @@ do_letrec_syntaxes(const char *where,
stx_env->insp,
rec, drec,
stx_env, rhs_env,
&i);
&i, NULL);
}
}