fix module->namespace on unexported syntax bindings
svn: r12774
This commit is contained in:
Matthew Flatt
parent
caf6a8be8c
commit
251d15f800
|
|
@ -68,10 +68,6 @@ cgc:
|
|||
cd dynsrc; $(MAKE) dynlib3m
|
||||
cd gc2; $(MAKE) ../mzscheme@MMM@
|
||||
|
||||
compact:
|
||||
$(MAKE) 3m
|
||||
cd gc2; $(MAKE) ../mzscheme_compact_gc
|
||||
|
||||
both:
|
||||
$(MAKE) cgc
|
||||
$(MAKE) 3m
|
||||
|
|
|
|||
|
|
@ -30,9 +30,6 @@ XSRCDIR = xsrc
|
|||
XFORM = env XFORM_USE_PRECOMP=$(XSRCDIR)/precomp.h $(XFORM_NOPRECOMP)
|
||||
SRCDIR = $(srcdir)/../src
|
||||
|
||||
XFORM_COMPACT_GC_NOPRECOMP = $(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS) -DUSE_COMPACT_3M_GC" @XFORMFLAGS@ -o
|
||||
XFORM_COMPACT_GC = env XFORM_USE_PRECOMP=$(XSRCDIR)/precomp.h $(XFORM_COMPACT_GC_NOPRECOMP)
|
||||
|
||||
FOREIGN_USED_OBJ = foreign.@LTO@
|
||||
FOREIGN_NOT_USED_OBJ =
|
||||
|
||||
|
|
@ -49,6 +46,7 @@ OBJS = salloc.@LTO@ \
|
|||
file.@LTO@ \
|
||||
fun.@LTO@ \
|
||||
hash.@LTO@ \
|
||||
jit.@LTO@ \
|
||||
list.@LTO@ \
|
||||
module.@LTO@ \
|
||||
mzrt.@LTO@ \
|
||||
|
|
@ -137,6 +135,15 @@ XFORMDEP = $(srcdir)/gc2.h $(srcdir)/xform.ss $(srcdir)/xform-mod.ss \
|
|||
$(srcdir)/../sconfig.h $(srcdir)/../uconfig.h $(srcdir)/../src/schemef.h \
|
||||
$(srcdir)/../src/stypes.h
|
||||
|
||||
LIGHTNINGDEP = $(srcdir)/../src/lightning/i386/core.h $(srcdir)/../src/lightning/i386/core-common.h \
|
||||
$(srcdir)/../src/lightning/i386/asm.h $(srcdir)/../src/lightning/i386/asm-common.h \
|
||||
$(srcdir)/../src/lightning/i386/fp.h $(srcdir)/../src/lightning/i386/fp-common.h \
|
||||
$(srcdir)/../src/lightning/i386/funcs.h $(srcdir)/../src/lightning/i386/funcs-common.h \
|
||||
$(srcdir)/../src/lightning/ppc/core.h $(srcdir)/../src/lightning/ppc/core-common.h \
|
||||
$(srcdir)/../src/lightning/ppc/asm.h $(srcdir)/../src/lightning/ppc/asm-common.h \
|
||||
$(srcdir)/../src/lightning/ppc/fp.h $(srcdir)/../src/lightning/ppc/fp-common.h \
|
||||
$(srcdir)/../src/lightning/ppc/funcs.h $(srcdir)/../src/lightning/ppc/funcs-common.h
|
||||
|
||||
$(XSRCDIR)/precomp.h : $(XFORMDEP) $(srcdir)/../src/schvers.h
|
||||
env XFORM_PRECOMP=yes $(XFORM_NOPRECOMP) $(XSRCDIR)/precomp.h $(srcdir)/precomp.c
|
||||
|
||||
|
|
@ -166,7 +173,7 @@ $(XSRCDIR)/fun.c: ../src/fun.@LTO@ $(XFORMDEP)
|
|||
$(XFORM) $(XSRCDIR)/fun.c $(SRCDIR)/fun.c
|
||||
$(XSRCDIR)/hash.c: ../src/hash.@LTO@ $(XFORMDEP)
|
||||
$(XFORM) $(XSRCDIR)/hash.c $(SRCDIR)/hash.c
|
||||
$(XSRCDIR)/jit.c: ../src/jit.@LTO@ $(XFORMDEP)
|
||||
$(XSRCDIR)/jit.c: ../src/jit.@LTO@ $(XFORMDEP) $(LIGHTNINGDEP)
|
||||
$(XFORM) $(XSRCDIR)/jit.c $(SRCDIR)/jit.c
|
||||
$(XSRCDIR)/module.c: ../src/module.@LTO@ $(XFORMDEP)
|
||||
$(XFORM) $(XSRCDIR)/module.c $(SRCDIR)/module.c
|
||||
|
|
@ -221,9 +228,6 @@ $(XSRCDIR)/foreign.c: ../../foreign/foreign.@LTO@ $(XFORMDEP)
|
|||
$(XSRCDIR)/main.c: ../main.@LTO@ $(XFORMDEP)
|
||||
$(XFORM_NOPRECOMP) $(XSRCDIR)/main.c $(DEF_COLLECTS_DIR) $(srcdir)/../main.c
|
||||
|
||||
$(XSRCDIR)/jit_compact_gc.c: ../src/jit.@LTO@ $(XFORMDEP)
|
||||
$(XFORM_COMPACT_GC) $(XSRCDIR)/jit_compact_gc.c $(SRCDIR)/jit.c
|
||||
|
||||
salloc.@LTO@: $(XSRCDIR)/salloc.c
|
||||
$(CC) $(CFLAGS) -c $(XSRCDIR)/salloc.c -o salloc.@LTO@
|
||||
bignum.@LTO@: $(XSRCDIR)/bignum.c
|
||||
|
|
@ -252,8 +256,6 @@ hash.@LTO@: $(XSRCDIR)/hash.c
|
|||
$(CC) $(CFLAGS) -c $(XSRCDIR)/hash.c -o hash.@LTO@
|
||||
jit.@LTO@: $(XSRCDIR)/jit.c
|
||||
$(CC) $(CFLAGS) -c $(XSRCDIR)/jit.c -o jit.@LTO@
|
||||
jit_compact_gc.@LTO@: $(XSRCDIR)/jit_compact_gc.c
|
||||
$(CC) $(CFLAGS) -c $(XSRCDIR)/jit_compact_gc.c -o jit_compact_gc.@LTO@
|
||||
list.@LTO@: $(XSRCDIR)/list.c
|
||||
$(CC) $(CFLAGS) -c $(XSRCDIR)/list.c -o list.@LTO@
|
||||
module.@LTO@: $(XSRCDIR)/module.c
|
||||
|
|
@ -318,30 +320,6 @@ gc2.@LTO@: $(srcdir)/gc2.c $(srcdir)/newgc.c $(srcdir)/gc2.h \
|
|||
$(srcdir)/weak.c $(srcdir)/fnls.c $(srcdir)/../include/scheme.h $(srcdir)/../src/schpriv.h
|
||||
$(CC) $(CFLAGS) -I$(builddir)/.. -c $(srcdir)/gc2.c -o gc2.@LTO@
|
||||
|
||||
new_gc.@LTO@: $(srcdir)/newgc.c $(srcdir)/gc2.h \
|
||||
$(srcdir)/vm_osx.c $(srcdir)/vm_mmap.c $(srcdir)/vm_osk.c $(srcdir)/vm.c\
|
||||
$(srcdir)/vm_memalign.c $(srcdir)/alloc_cache.c \
|
||||
$(srcdir)/page_range.c $(srcdir)/protect_range.c $(srcdir)/var_stack.c $(srcdir)/stack_comp.c \
|
||||
$(srcdir)/../utils/splay.c $(srcdir)/my_qsort.c $(srcdir)/backtrace.c \
|
||||
$(srcdir)/weak.c $(srcdir)/fnls.c $(srcdir)/../include/scheme.h $(srcdir)/../src/schpriv.h
|
||||
$(CC) $(CFLAGS) -c $(srcdir)/newgc.c -o new_gc.@LTO@
|
||||
|
||||
copy_gc.@LTO@: $(srcdir)/copy.c $(srcdir)/gc2.h \
|
||||
$(srcdir)/vm_osx.c $(srcdir)/vm_mmap.c $(srcdir)/vm_osk.c $(srcdir)/vm.c\
|
||||
$(srcdir)/vm_memalign.c $(srcdir)/alloc_cache.c \
|
||||
$(srcdir)/page_range.c $(srcdir)/protect_range.c $(srcdir)/var_stack.c $(srcdir)/stack_comp.c \
|
||||
$(srcdir)/../utils/splay.c $(srcdir)/my_qsort.c $(srcdir)/backtrace.c \
|
||||
$(srcdir)/weak.c $(srcdir)/fnls.c $(srcdir)/../include/scheme.h $(srcdir)/../src/schpriv.h
|
||||
$(CC) $(CFLAGS) -c $(srcdir)/copy.c -o copy_gc.@LTO@
|
||||
|
||||
compact_gc.@LTO@: $(srcdir)/compact.c $(srcdir)/gc2.h \
|
||||
$(srcdir)/vm_osx.c $(srcdir)/vm_mmap.c $(srcdir)/vm_osk.c $(srcdir)/vm.c\
|
||||
$(srcdir)/vm_memalign.c $(srcdir)/alloc_cache.c \
|
||||
$(srcdir)/page_range.c $(srcdir)/protect_range.c $(srcdir)/var_stack.c $(srcdir)/stack_comp.c \
|
||||
$(srcdir)/../utils/splay.c $(srcdir)/my_qsort.c $(srcdir)/backtrace.c \
|
||||
$(srcdir)/weak.c $(srcdir)/fnls.c $(srcdir)/../include/scheme.h $(srcdir)/../src/schpriv.h
|
||||
$(CC) $(CFLAGS) -c $(srcdir)/compact.c -o compact_gc.@LTO@
|
||||
|
||||
FOREIGN_OBJS = ../../foreign/gcc/libffi/src/*.@LTO@ ../../foreign/gcc/libffi/src/*/*.@LTO@
|
||||
FOREIGN_LIB = ../../foreign/gcc/libffi/libffi@FOREIGN_CONVENIENCE@.la
|
||||
FOREIGN_OBJSLIB = @FOREIGN_OBJSLIB@
|
||||
|
|
@ -354,20 +332,13 @@ FOREIGN_NOT_USED_OBJSLIB =
|
|||
EXTRA_OBJS_T = ../src/gmp.@LTO@ ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_LIB)
|
||||
EXTRA_OBJS_L = ../src/gmp.@LTO@ ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB)
|
||||
|
||||
../libmzscheme3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T) jit.@LTO@ gc2.@LTO@
|
||||
$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) jit.@LTO@ gc2.@LTO@
|
||||
../libmzscheme3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T) gc2.@LTO@
|
||||
$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) gc2.@LTO@
|
||||
$(RANLIB) ../libmzscheme3m.@LIBSFX@
|
||||
|
||||
../libmzscheme_compact_gc.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T) jit_compact_gc.@LTO@ compact_gc.@LTO@
|
||||
$(AR) $(ARFLAGS) ../libmzscheme_compact_gc.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) jit_compact_gc.@LTO@ compact_gc.@LTO@
|
||||
$(RANLIB) ../libmzscheme_compact_gc.@LIBSFX@
|
||||
|
||||
../mzscheme@MMM@@NOT_OSX@: main.@LTO@ ../libmzscheme3m.@LIBSFX@
|
||||
cd ..; @MZLINKER@ -o mzscheme@MMM@ @PROFFLAGS@ gc2/main.@LTO@ libmzscheme3m.@LIBSFX@ @LDFLAGS@ $(LIBS)
|
||||
|
||||
../mzscheme_compact_gc@NOT_OSX@: main.@LTO@ ../libmzscheme_compact_gc.@LIBSFX@
|
||||
cd ..; @MZLINKER@ -o mzscheme_compact_gc @PROFFLAGS@ gc2/main.@LTO@ libmzscheme_compact_gc.@LIBSFX@ @LDFLAGS@ $(LIBS)
|
||||
|
||||
# The above "cd .." prevents a problem with libtool's generated script in --enable-shared mode,
|
||||
# at least for Mac OS X. Beware of changing LIBS or LDFLAGS to inclucde something with a relative
|
||||
# path.
|
||||
|
|
@ -386,9 +357,6 @@ $(MZFWMMM): ../libmzscheme3m.@LIBSFX@
|
|||
cp "PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "../PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme"
|
||||
/usr/bin/install_name_tool -change "PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "../mzscheme@MMM@"
|
||||
|
||||
../mzscheme_compact_gc@OSX@:
|
||||
echo "../mzscheme_compact_gc does not currently build on Mac OS X; use --enable-compact with configure, instead"
|
||||
|
||||
clean:
|
||||
/bin/rm -f ../mzscheme@MMM@ *.@LTO@ $(XSRCDIR)/*
|
||||
/bin/rm -rf xform-collects
|
||||
|
|
|
|||
|
|
@ -268,8 +268,12 @@ jit.@LTO@: $(srcdir)/schpriv.h $(srcdir)/schexn.h $(SCONFIG) $(srcdir)/../includ
|
|||
$(srcdir)/../src/stypes.h $(srcdir)/codetab.inc $(srcdir)/mzmark.c \
|
||||
$(srcdir)/lightning/i386/core.h $(srcdir)/lightning/i386/core-common.h \
|
||||
$(srcdir)/lightning/i386/asm.h $(srcdir)/lightning/i386/asm-common.h \
|
||||
$(srcdir)/lightning/i386/funcs.h $(srcdir)/lightning/i386/funcs-common.h \
|
||||
$(srcdir)/lightning/i386/fp.h $(srcdir)/lightning/i386/fp-common.h \
|
||||
$(srcdir)/lightning/ppc/core.h $(srcdir)/lightning/ppc/core-common.h \
|
||||
$(srcdir)/lightning/ppc/asm.h $(srcdir)/lightning/ppc/asm-common.h
|
||||
$(srcdir)/lightning/ppc/asm.h $(srcdir)/lightning/ppc/asm-common.h \
|
||||
$(srcdir)/lightning/ppc/funcs.h $(srcdir)/lightning/ppc/funcs-common.h \
|
||||
$(srcdir)/lightning/ppc/fp.h $(srcdir)/lightning/ppc/fp-common.h
|
||||
list.@LTO@: $(srcdir)/schpriv.h $(srcdir)/schexn.h $(SCONFIG) $(srcdir)/../include/scheme.h \
|
||||
$(srcdir)/../src/stypes.h
|
||||
module.@LTO@: $(srcdir)/schpriv.h $(srcdir)/schexn.h $(SCONFIG) $(srcdir)/../include/scheme.h \
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,51,46,52,50,0,0,0,1,0,0,6,0,9,0,
|
||||
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,51,46,53,50,0,0,0,1,0,0,6,0,9,0,
|
||||
18,0,22,0,35,0,38,0,43,0,50,0,55,0,60,0,67,0,74,0,78,
|
||||
0,84,0,98,0,112,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,
|
||||
1,234,1,42,2,130,2,194,2,199,2,219,2,110,3,130,3,181,3,247,3,
|
||||
132,4,34,5,84,5,107,5,186,5,0,0,201,7,0,0,65,98,101,103,105,
|
||||
132,4,34,5,84,5,107,5,186,5,0,0,204,7,0,0,65,98,101,103,105,
|
||||
110,29,11,11,68,104,101,114,101,45,115,116,120,63,108,101,116,72,112,97,114,
|
||||
97,109,101,116,101,114,105,122,101,62,111,114,64,108,101,116,42,66,117,110,108,
|
||||
101,115,115,64,99,111,110,100,64,119,104,101,110,66,108,101,116,114,101,99,66,
|
||||
|
|
@ -29,15 +29,15 @@
|
|||
248,22,72,248,22,66,23,195,2,248,22,65,193,249,22,190,3,80,158,38,35,
|
||||
251,22,74,2,17,248,22,65,23,200,2,249,22,64,2,13,248,22,66,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,52,16,4,11,11,2,19,3,1,7,
|
||||
101,110,118,57,55,57,53,93,8,224,252,60,0,0,95,9,8,224,252,60,0,
|
||||
2,18,3,1,7,101,110,118,57,55,57,51,16,4,11,11,2,19,3,1,7,
|
||||
101,110,118,57,55,57,52,93,8,224,252,60,0,0,95,9,8,224,252,60,0,
|
||||
0,2,2,27,248,22,66,248,22,133,4,23,197,1,28,248,22,72,23,194,2,
|
||||
20,15,159,36,35,36,28,248,22,72,248,22,66,23,195,2,248,22,65,193,249,
|
||||
22,190,3,80,158,38,35,250,22,74,2,20,248,22,74,249,22,74,248,22,74,
|
||||
2,21,248,22,65,23,202,2,251,22,74,2,17,2,21,2,21,249,22,64,2,
|
||||
6,248,22,66,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,55,16,4,11,11,
|
||||
2,19,3,1,7,101,110,118,57,55,57,56,93,8,224,253,60,0,0,95,9,
|
||||
27,16,4,11,11,2,18,3,1,7,101,110,118,57,55,57,54,16,4,11,11,
|
||||
2,19,3,1,7,101,110,118,57,55,57,55,93,8,224,253,60,0,0,95,9,
|
||||
8,224,253,60,0,0,2,2,248,22,133,4,193,27,248,22,133,4,194,249,22,
|
||||
64,248,22,74,248,22,65,196,248,22,66,195,27,248,22,66,248,22,133,4,23,
|
||||
197,1,249,22,190,3,80,158,38,35,28,248,22,52,248,22,191,3,248,22,65,
|
||||
|
|
@ -68,48 +68,48 @@
|
|||
249,22,162,8,248,22,191,3,248,22,65,23,201,2,64,101,108,115,101,10,248,
|
||||
22,65,23,198,2,250,22,75,2,20,9,248,22,66,23,201,1,249,22,64,2,
|
||||
9,248,22,66,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,48,16,4,11,11,2,19,3,1,
|
||||
7,101,110,118,57,56,50,49,93,8,224,254,60,0,0,18,16,2,158,94,10,
|
||||
11,2,18,3,1,7,101,110,118,57,56,49,57,16,4,11,11,2,19,3,1,
|
||||
7,101,110,118,57,56,50,48,93,8,224,254,60,0,0,18,16,2,158,94,10,
|
||||
64,118,111,105,100,8,47,95,9,8,224,254,60,0,0,2,2,27,248,22,66,
|
||||
248,22,133,4,196,249,22,190,3,80,158,38,35,28,248,22,52,248,22,191,3,
|
||||
248,22,65,197,250,22,74,2,26,248,22,74,248,22,65,199,248,22,89,198,27,
|
||||
248,22,191,3,248,22,65,197,250,22,74,2,26,248,22,74,248,22,65,197,250,
|
||||
22,75,2,23,248,22,66,199,248,22,66,202,159,35,20,103,159,35,16,1,2,
|
||||
1,16,0,83,158,41,20,100,141,69,35,37,109,105,110,45,115,116,120,2,2,
|
||||
1,16,0,83,158,41,20,100,143,69,35,37,109,105,110,45,115,116,120,2,2,
|
||||
11,10,11,10,35,80,158,35,35,20,103,159,35,16,0,16,0,11,11,16,1,
|
||||
2,3,36,16,0,35,11,11,38,35,11,11,16,10,2,4,2,5,2,6,2,
|
||||
7,2,8,2,9,2,10,2,11,2,12,2,13,16,10,11,11,11,11,11,11,
|
||||
11,11,11,11,16,10,2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,
|
||||
11,2,12,2,13,35,45,36,11,11,16,0,16,0,16,0,35,35,11,11,11,
|
||||
16,0,16,0,16,0,35,35,16,11,16,5,93,2,3,20,15,159,35,35,35,
|
||||
35,20,103,159,35,16,0,16,1,33,32,10,16,5,93,2,8,89,162,8,44,
|
||||
36,52,9,223,0,33,33,35,20,103,159,35,16,1,20,25,159,36,2,2,2,
|
||||
3,16,0,11,16,5,93,2,10,89,162,8,44,36,52,9,223,0,33,34,35,
|
||||
20,103,159,35,16,1,20,25,159,36,2,2,2,3,16,0,11,16,5,93,2,
|
||||
13,89,162,8,44,36,52,9,223,0,33,35,35,20,103,159,35,16,1,20,25,
|
||||
159,36,2,2,2,3,16,1,33,36,11,16,5,93,2,6,89,162,8,44,36,
|
||||
55,9,223,0,33,37,35,20,103,159,35,16,1,20,25,159,36,2,2,2,3,
|
||||
16,1,33,38,11,16,5,93,2,4,89,162,8,44,36,57,9,223,0,33,41,
|
||||
2,3,36,16,0,35,16,0,35,11,11,38,35,11,11,16,10,2,4,2,5,
|
||||
2,6,2,7,2,8,2,9,2,10,2,11,2,12,2,13,16,10,11,11,11,
|
||||
11,11,11,11,11,11,11,16,10,2,4,2,5,2,6,2,7,2,8,2,9,
|
||||
2,10,2,11,2,12,2,13,35,45,36,11,11,16,0,16,0,16,0,35,35,
|
||||
11,11,11,16,0,16,0,16,0,35,35,16,11,16,5,93,2,3,20,15,159,
|
||||
35,35,35,35,20,103,159,35,16,0,16,1,33,32,10,16,5,93,2,8,89,
|
||||
162,8,44,36,52,9,223,0,33,33,35,20,103,159,35,16,1,20,25,159,36,
|
||||
2,2,2,3,16,0,11,16,5,93,2,10,89,162,8,44,36,52,9,223,0,
|
||||
33,34,35,20,103,159,35,16,1,20,25,159,36,2,2,2,3,16,0,11,16,
|
||||
5,93,2,13,89,162,8,44,36,52,9,223,0,33,35,35,20,103,159,35,16,
|
||||
1,20,25,159,36,2,2,2,3,16,1,33,36,11,16,5,93,2,6,89,162,
|
||||
8,44,36,55,9,223,0,33,37,35,20,103,159,35,16,1,20,25,159,36,2,
|
||||
2,2,3,16,1,33,38,11,16,5,93,2,4,89,162,8,44,36,57,9,223,
|
||||
0,33,41,35,20,103,159,35,16,1,20,25,159,36,2,2,2,3,16,0,11,
|
||||
16,5,93,2,11,89,162,8,44,36,52,9,223,0,33,43,35,20,103,159,35,
|
||||
16,1,20,25,159,36,2,2,2,3,16,0,11,16,5,93,2,7,89,162,8,
|
||||
44,36,53,9,223,0,33,44,35,20,103,159,35,16,1,20,25,159,36,2,2,
|
||||
2,3,16,0,11,16,5,93,2,5,89,162,8,44,36,54,9,223,0,33,45,
|
||||
35,20,103,159,35,16,1,20,25,159,36,2,2,2,3,16,0,11,16,5,93,
|
||||
2,11,89,162,8,44,36,52,9,223,0,33,43,35,20,103,159,35,16,1,20,
|
||||
25,159,36,2,2,2,3,16,0,11,16,5,93,2,7,89,162,8,44,36,53,
|
||||
9,223,0,33,44,35,20,103,159,35,16,1,20,25,159,36,2,2,2,3,16,
|
||||
0,11,16,5,93,2,5,89,162,8,44,36,54,9,223,0,33,45,35,20,103,
|
||||
159,35,16,1,20,25,159,36,2,2,2,3,16,0,11,16,5,93,2,9,89,
|
||||
162,8,44,36,57,9,223,0,33,46,35,20,103,159,35,16,1,20,25,159,36,
|
||||
2,2,2,3,16,1,33,48,11,16,5,93,2,12,89,162,8,44,36,53,9,
|
||||
223,0,33,49,35,20,103,159,35,16,1,20,25,159,36,2,2,2,3,16,0,
|
||||
11,16,0,94,2,15,2,16,93,2,15,9,9,35,0};
|
||||
EVAL_ONE_SIZED_STR((char *)expr, 2114);
|
||||
2,9,89,162,8,44,36,57,9,223,0,33,46,35,20,103,159,35,16,1,20,
|
||||
25,159,36,2,2,2,3,16,1,33,48,11,16,5,93,2,12,89,162,8,44,
|
||||
36,53,9,223,0,33,49,35,20,103,159,35,16,1,20,25,159,36,2,2,2,
|
||||
3,16,0,11,16,0,94,2,15,2,16,93,2,15,9,9,35,0};
|
||||
EVAL_ONE_SIZED_STR((char *)expr, 2117);
|
||||
}
|
||||
{
|
||||
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,51,46,52,60,0,0,0,1,0,0,3,0,16,0,
|
||||
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,51,46,53,60,0,0,0,1,0,0,3,0,16,0,
|
||||
21,0,38,0,53,0,71,0,87,0,97,0,115,0,135,0,151,0,169,0,200,
|
||||
0,229,0,251,0,9,1,15,1,29,1,34,1,44,1,52,1,80,1,112,1,
|
||||
157,1,202,1,226,1,9,2,11,2,68,2,158,3,199,3,33,5,137,5,241,
|
||||
5,102,6,116,6,150,6,166,6,16,8,30,8,193,8,194,9,194,10,201,10,
|
||||
208,10,215,10,90,11,103,11,58,12,160,12,173,12,195,12,147,13,51,14,122,
|
||||
15,130,15,138,15,164,15,18,16,0,0,67,19,0,0,29,11,11,72,112,97,
|
||||
15,130,15,138,15,164,15,18,16,0,0,70,19,0,0,29,11,11,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,97,115,101,45,112,97,116,104,74,45,99,104,101,99,107,45,114,101,
|
||||
108,112,97,116,104,77,45,99,104,101,99,107,45,99,111,108,108,101,99,116,105,
|
||||
|
|
@ -306,7 +306,7 @@
|
|||
173,3,23,202,1,28,192,192,35,249,22,151,5,23,197,1,83,158,39,20,97,
|
||||
95,89,162,8,44,35,47,9,224,3,2,33,58,23,195,1,23,196,1,27,248,
|
||||
22,136,5,23,195,1,248,80,159,38,53,36,193,159,35,20,103,159,35,16,1,
|
||||
65,98,101,103,105,110,16,0,83,158,41,20,100,141,67,35,37,117,116,105,108,
|
||||
65,98,101,103,105,110,16,0,83,158,41,20,100,143,67,35,37,117,116,105,108,
|
||||
115,2,1,11,11,10,10,42,80,158,35,35,20,103,159,37,16,17,30,2,1,
|
||||
2,2,193,30,2,1,2,3,193,30,2,1,2,4,193,30,2,1,2,5,193,
|
||||
30,2,1,2,6,193,30,2,1,2,7,193,30,2,1,2,8,193,30,2,1,
|
||||
|
|
@ -315,63 +315,63 @@
|
|||
2,16,193,30,2,18,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,18,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,16,0,11,11,16,
|
||||
0,35,16,4,2,6,2,5,2,3,2,9,39,11,11,38,35,11,11,16,11,
|
||||
2,8,2,7,2,16,2,15,2,13,2,12,2,4,2,11,2,14,2,10,2,
|
||||
2,16,11,11,11,11,11,11,11,11,11,11,11,11,16,11,2,8,2,7,2,
|
||||
16,2,15,2,13,2,12,2,4,2,11,2,14,2,10,2,2,46,46,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,17,83,158,35,16,2,89,162,43,36,48,2,19,223,0,33,29,80,159,
|
||||
35,53,36,83,158,35,16,2,89,162,8,44,36,55,2,19,223,0,33,30,80,
|
||||
159,35,52,36,83,158,35,16,2,32,0,89,162,43,36,44,2,2,222,33,31,
|
||||
80,159,35,35,36,83,158,35,16,2,249,22,159,6,7,92,7,92,80,159,35,
|
||||
36,36,83,158,35,16,2,89,162,43,36,53,2,4,223,0,33,32,80,159,35,
|
||||
37,36,83,158,35,16,2,32,0,89,162,8,44,37,49,2,5,222,33,33,80,
|
||||
159,35,38,36,83,158,35,16,2,32,0,89,162,8,44,38,50,2,6,222,33,
|
||||
35,80,159,35,39,36,83,158,35,16,2,89,162,8,45,37,47,2,7,223,0,
|
||||
33,37,80,159,35,40,36,83,158,35,16,2,32,0,89,162,43,39,51,2,8,
|
||||
222,33,40,80,159,35,41,36,83,158,35,16,2,32,0,89,162,43,38,49,2,
|
||||
9,222,33,41,80,159,35,42,36,83,158,35,16,2,32,0,89,162,43,37,52,
|
||||
2,10,222,33,42,80,159,35,43,36,83,158,35,16,2,32,0,89,162,43,37,
|
||||
53,2,11,222,33,43,80,159,35,44,36,83,158,35,16,2,32,0,89,162,43,
|
||||
36,43,2,12,222,33,44,80,159,35,45,36,83,158,35,16,2,83,158,38,20,
|
||||
96,96,2,13,89,162,43,35,43,9,223,0,33,45,89,162,43,36,44,9,223,
|
||||
0,33,46,89,162,43,37,54,9,223,0,33,47,80,159,35,46,36,83,158,35,
|
||||
16,2,27,248,22,182,13,248,22,168,7,27,28,249,22,162,8,247,22,176,7,
|
||||
2,21,6,1,1,59,6,1,1,58,250,22,141,7,6,14,14,40,91,94,126,
|
||||
97,93,42,41,126,97,40,46,42,41,23,196,2,23,196,1,89,162,8,44,37,
|
||||
47,2,14,223,0,33,50,80,159,35,47,36,83,158,35,16,2,83,158,38,20,
|
||||
96,96,2,15,89,162,8,44,38,53,9,223,0,33,55,89,162,43,37,46,9,
|
||||
223,0,33,56,89,162,43,36,45,9,223,0,33,57,80,159,35,48,36,83,158,
|
||||
35,16,2,89,162,43,38,51,2,16,223,0,33,59,80,159,35,49,36,94,29,
|
||||
94,2,17,68,35,37,107,101,114,110,101,108,11,29,94,2,17,69,35,37,109,
|
||||
105,110,45,115,116,120,11,9,9,9,35,0};
|
||||
EVAL_ONE_SIZED_STR((char *)expr, 5072);
|
||||
0,35,16,0,35,16,4,2,6,2,5,2,3,2,9,39,11,11,38,35,11,
|
||||
11,16,11,2,8,2,7,2,16,2,15,2,13,2,12,2,4,2,11,2,14,
|
||||
2,10,2,2,16,11,11,11,11,11,11,11,11,11,11,11,11,16,11,2,8,
|
||||
2,7,2,16,2,15,2,13,2,12,2,4,2,11,2,14,2,10,2,2,46,
|
||||
46,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,17,83,158,35,16,2,89,162,43,36,48,2,19,223,0,33,
|
||||
29,80,159,35,53,36,83,158,35,16,2,89,162,8,44,36,55,2,19,223,0,
|
||||
33,30,80,159,35,52,36,83,158,35,16,2,32,0,89,162,43,36,44,2,2,
|
||||
222,33,31,80,159,35,35,36,83,158,35,16,2,249,22,159,6,7,92,7,92,
|
||||
80,159,35,36,36,83,158,35,16,2,89,162,43,36,53,2,4,223,0,33,32,
|
||||
80,159,35,37,36,83,158,35,16,2,32,0,89,162,8,44,37,49,2,5,222,
|
||||
33,33,80,159,35,38,36,83,158,35,16,2,32,0,89,162,8,44,38,50,2,
|
||||
6,222,33,35,80,159,35,39,36,83,158,35,16,2,89,162,8,45,37,47,2,
|
||||
7,223,0,33,37,80,159,35,40,36,83,158,35,16,2,32,0,89,162,43,39,
|
||||
51,2,8,222,33,40,80,159,35,41,36,83,158,35,16,2,32,0,89,162,43,
|
||||
38,49,2,9,222,33,41,80,159,35,42,36,83,158,35,16,2,32,0,89,162,
|
||||
43,37,52,2,10,222,33,42,80,159,35,43,36,83,158,35,16,2,32,0,89,
|
||||
162,43,37,53,2,11,222,33,43,80,159,35,44,36,83,158,35,16,2,32,0,
|
||||
89,162,43,36,43,2,12,222,33,44,80,159,35,45,36,83,158,35,16,2,83,
|
||||
158,38,20,96,96,2,13,89,162,43,35,43,9,223,0,33,45,89,162,43,36,
|
||||
44,9,223,0,33,46,89,162,43,37,54,9,223,0,33,47,80,159,35,46,36,
|
||||
83,158,35,16,2,27,248,22,182,13,248,22,168,7,27,28,249,22,162,8,247,
|
||||
22,176,7,2,21,6,1,1,59,6,1,1,58,250,22,141,7,6,14,14,40,
|
||||
91,94,126,97,93,42,41,126,97,40,46,42,41,23,196,2,23,196,1,89,162,
|
||||
8,44,37,47,2,14,223,0,33,50,80,159,35,47,36,83,158,35,16,2,83,
|
||||
158,38,20,96,96,2,15,89,162,8,44,38,53,9,223,0,33,55,89,162,43,
|
||||
37,46,9,223,0,33,56,89,162,43,36,45,9,223,0,33,57,80,159,35,48,
|
||||
36,83,158,35,16,2,89,162,43,38,51,2,16,223,0,33,59,80,159,35,49,
|
||||
36,94,29,94,2,17,68,35,37,107,101,114,110,101,108,11,29,94,2,17,69,
|
||||
35,37,109,105,110,45,115,116,120,11,9,9,9,35,0};
|
||||
EVAL_ONE_SIZED_STR((char *)expr, 5075);
|
||||
}
|
||||
{
|
||||
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,51,46,52,8,0,0,0,1,0,0,6,0,19,0,
|
||||
34,0,48,0,62,0,76,0,111,0,0,0,3,1,0,0,65,113,117,111,116,
|
||||
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,51,46,53,8,0,0,0,1,0,0,6,0,19,0,
|
||||
34,0,48,0,62,0,76,0,111,0,0,0,6,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,186,245,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,65,98,101,103,105,110,16,0,83,158,41,20,
|
||||
100,141,69,35,37,98,117,105,108,116,105,110,29,11,11,11,10,10,18,96,11,
|
||||
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,158,35,35,20,103,159,35,16,0,16,0,11,11,16,0,35,
|
||||
16,0,35,11,11,38,35,11,11,16,0,16,0,16,0,35,35,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,
|
||||
0,99,2,6,2,5,29,94,2,1,69,35,37,102,111,114,101,105,103,110,11,
|
||||
2,4,2,3,2,2,29,94,2,1,67,35,37,112,108,97,99,101,11,9,9,
|
||||
9,35,0};
|
||||
EVAL_ONE_SIZED_STR((char *)expr, 296);
|
||||
16,0,35,16,0,35,11,11,38,35,11,11,16,0,16,0,16,0,35,35,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,0,99,2,6,2,5,29,94,2,1,69,35,37,102,111,114,101,105,
|
||||
103,110,11,2,4,2,3,2,2,29,94,2,1,67,35,37,112,108,97,99,101,
|
||||
11,9,9,9,35,0};
|
||||
EVAL_ONE_SIZED_STR((char *)expr, 299);
|
||||
}
|
||||
{
|
||||
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,51,46,52,53,0,0,0,1,0,0,3,0,14,0,
|
||||
static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,51,46,53,53,0,0,0,1,0,0,3,0,14,0,
|
||||
41,0,47,0,60,0,74,0,96,0,122,0,134,0,152,0,172,0,184,0,200,
|
||||
0,223,0,3,1,8,1,13,1,18,1,27,1,32,1,63,1,67,1,75,1,
|
||||
83,1,91,1,194,1,239,1,3,2,31,2,62,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,15,6,21,6,
|
||||
35,6,62,6,147,6,149,6,214,6,149,12,208,12,240,12,0,0,168,15,0,
|
||||
35,6,62,6,147,6,149,6,214,6,149,12,208,12,240,12,0,0,171,15,0,
|
||||
0,29,11,11,70,100,108,108,45,115,117,102,102,105,120,1,25,100,101,102,97,
|
||||
117,108,116,45,108,111,97,100,47,117,115,101,45,99,111,109,112,105,108,101,100,
|
||||
65,113,117,111,116,101,29,94,2,4,67,35,37,117,116,105,108,115,11,29,94,
|
||||
|
|
@ -530,7 +530,7 @@
|
|||
33,43,89,162,43,38,48,9,223,1,33,44,89,162,43,39,8,30,9,225,2,
|
||||
3,0,33,50,208,87,95,248,22,150,4,248,80,158,37,49,247,22,183,11,248,
|
||||
22,188,4,80,158,36,36,248,22,174,12,80,159,36,41,36,159,35,20,103,159,
|
||||
35,16,1,65,98,101,103,105,110,16,0,83,158,41,20,100,141,66,35,37,98,
|
||||
35,16,1,65,98,101,103,105,110,16,0,83,158,41,20,100,143,66,35,37,98,
|
||||
111,111,116,2,1,11,11,10,10,36,80,158,35,35,20,103,159,39,16,19,30,
|
||||
2,1,2,2,193,30,2,1,2,3,193,30,2,5,72,112,97,116,104,45,115,
|
||||
116,114,105,110,103,63,10,30,2,5,75,112,97,116,104,45,97,100,100,45,115,
|
||||
|
|
@ -542,26 +542,27 @@
|
|||
1,2,14,193,30,2,1,2,15,193,30,2,5,69,45,102,105,110,100,45,99,
|
||||
111,108,0,30,2,5,76,110,111,114,109,97,108,45,99,97,115,101,45,112,97,
|
||||
116,104,6,30,2,5,79,112,97,116,104,45,114,101,112,108,97,99,101,45,115,
|
||||
117,102,102,105,120,9,30,2,1,2,16,193,16,0,11,11,16,0,35,16,11,
|
||||
2,10,2,11,2,8,2,9,2,12,2,13,2,3,2,7,2,2,2,15,2,
|
||||
14,46,11,11,38,35,11,11,16,1,2,16,16,1,11,16,1,2,16,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,24,80,
|
||||
159,35,57,36,83,158,35,16,2,89,162,43,36,44,9,223,0,33,25,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,26,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,27,80,159,35,54,36,83,158,35,16,2,
|
||||
248,22,176,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,3,223,0,33,36,80,159,35,36,36,83,158,
|
||||
35,16,2,32,0,89,162,8,44,36,41,2,7,222,192,80,159,35,41,36,83,
|
||||
158,35,16,2,247,22,125,80,159,35,42,36,83,158,35,16,2,247,22,124,80,
|
||||
159,35,43,36,83,158,35,16,2,247,22,60,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,14,222,33,42,80,159,
|
||||
35,48,36,83,158,35,16,2,89,162,8,44,36,44,2,15,223,0,33,51,80,
|
||||
159,35,49,36,83,158,35,16,2,89,162,43,35,43,2,16,223,0,33,52,80,
|
||||
159,35,53,36,95,29,94,2,4,68,35,37,107,101,114,110,101,108,11,29,94,
|
||||
2,4,69,35,37,109,105,110,45,115,116,120,11,2,5,9,9,9,35,0};
|
||||
EVAL_ONE_SIZED_STR((char *)expr, 4135);
|
||||
117,102,102,105,120,9,30,2,1,2,16,193,16,0,11,11,16,0,35,16,0,
|
||||
35,16,11,2,10,2,11,2,8,2,9,2,12,2,13,2,3,2,7,2,2,
|
||||
2,15,2,14,46,11,11,38,35,11,11,16,1,2,16,16,1,11,16,1,2,
|
||||
16,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,24,80,159,35,57,36,83,158,35,16,2,89,162,43,36,44,9,223,0,33,
|
||||
25,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,26,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,27,80,159,35,54,36,83,158,
|
||||
35,16,2,248,22,176,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,3,223,0,33,36,80,159,35,36,
|
||||
36,83,158,35,16,2,32,0,89,162,8,44,36,41,2,7,222,192,80,159,35,
|
||||
41,36,83,158,35,16,2,247,22,125,80,159,35,42,36,83,158,35,16,2,247,
|
||||
22,124,80,159,35,43,36,83,158,35,16,2,247,22,60,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,14,222,33,
|
||||
42,80,159,35,48,36,83,158,35,16,2,89,162,8,44,36,44,2,15,223,0,
|
||||
33,51,80,159,35,49,36,83,158,35,16,2,89,162,43,35,43,2,16,223,0,
|
||||
33,52,80,159,35,53,36,95,29,94,2,4,68,35,37,107,101,114,110,101,108,
|
||||
11,29,94,2,4,69,35,37,109,105,110,45,115,116,120,11,2,5,9,9,9,
|
||||
35,0};
|
||||
EVAL_ONE_SIZED_STR((char *)expr, 4138);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -248,7 +248,8 @@ static char *compute_provide_arrays(Scheme_Hash_Table *all_provided, Scheme_Hash
|
|||
char **_phase1_protects);
|
||||
static Scheme_Object **compute_indirects(Scheme_Env *genv,
|
||||
Scheme_Module_Phase_Exports *pt,
|
||||
int *_count);
|
||||
int *_count,
|
||||
int vars);
|
||||
static void start_module(Scheme_Module *m, Scheme_Env *env, int restart, Scheme_Object *syntax_idx,
|
||||
int eval_exp, int eval_run, long base_phase, Scheme_Object *cycle_list);
|
||||
static void finish_expstart_module(Scheme_Env *menv);
|
||||
|
|
@ -2369,6 +2370,11 @@ void scheme_prep_namespace_rename(Scheme_Env *menv)
|
|||
scheme_extend_module_rename(one_rn, m->self_modidx, name, name, m->self_modidx, name, 0,
|
||||
scheme_make_integer(0), NULL, 0);
|
||||
}
|
||||
for (i = 0; i < m->num_indirect_syntax_provides; i++) {
|
||||
name = m->indirect_syntax_provides[i];
|
||||
scheme_extend_module_rename(one_rn, m->self_modidx, name, name, m->self_modidx, name, 0,
|
||||
scheme_make_integer(0), NULL, 0);
|
||||
}
|
||||
|
||||
one_rn = scheme_get_module_rename_from_set(rns, scheme_make_integer(1), 1);
|
||||
|
||||
|
|
@ -5678,9 +5684,9 @@ static Scheme_Object *do_module_begin(Scheme_Object *form, Scheme_Comp_Env *env,
|
|||
Scheme_Object *post_ex_rn_set; /* phase -> post_ex_rn-like rename */
|
||||
Scheme_Hash_Table *tables; /* phase -> (vector toplevels requires syntaxes) */
|
||||
Scheme_Object *exclude_hint = scheme_false, *lift_data;
|
||||
Scheme_Object **exis, **et_exis;
|
||||
Scheme_Object **exis, **et_exis, **exsis;
|
||||
Scheme_Object *lift_ctx;
|
||||
int exicount, et_exicount;
|
||||
int exicount, et_exicount, exsicount;
|
||||
char *exps, *et_exps;
|
||||
int all_simple_renames = 1;
|
||||
int maybe_has_lifts = 0;
|
||||
|
|
@ -6395,8 +6401,9 @@ static Scheme_Object *do_module_begin(Scheme_Object *form, Scheme_Comp_Env *env,
|
|||
form, &et_exps);
|
||||
|
||||
/* Compute indirect provides (which is everything at the top-level): */
|
||||
exis = compute_indirects(env->genv, env->genv->module->me->rt, &exicount);
|
||||
et_exis = compute_indirects(env->genv->exp_env, env->genv->module->me->et, &et_exicount);
|
||||
exis = compute_indirects(env->genv, env->genv->module->me->rt, &exicount, 1);
|
||||
exsis = compute_indirects(env->genv, env->genv->module->me->rt, &exsicount, 0);
|
||||
et_exis = compute_indirects(env->genv->exp_env, env->genv->module->me->et, &et_exicount, 1);
|
||||
|
||||
if (rec[drec].comp || (rec[drec].depth != -2)) {
|
||||
scheme_clean_dead_env(env->genv);
|
||||
|
|
@ -6519,6 +6526,14 @@ static Scheme_Object *do_module_begin(Scheme_Object *form, Scheme_Comp_Env *env,
|
|||
env->genv->module->indirect_provides = exis;
|
||||
env->genv->module->num_indirect_provides = exicount;
|
||||
|
||||
if (all_simple_renames) {
|
||||
env->genv->module->indirect_syntax_provides = exsis;
|
||||
env->genv->module->num_indirect_syntax_provides = exsicount;
|
||||
} else {
|
||||
env->genv->module->indirect_syntax_provides = NULL;
|
||||
env->genv->module->num_indirect_syntax_provides = 0;
|
||||
}
|
||||
|
||||
env->genv->module->et_indirect_provides = et_exis;
|
||||
env->genv->module->num_indirect_et_provides = et_exicount;
|
||||
|
||||
|
|
@ -6930,18 +6945,34 @@ int compute_reprovides(Scheme_Hash_Table *all_provided,
|
|||
|
||||
static Scheme_Object **compute_indirects(Scheme_Env *genv,
|
||||
Scheme_Module_Phase_Exports *pt,
|
||||
int *_count)
|
||||
int *_count,
|
||||
int vars)
|
||||
{
|
||||
int i, count, j;
|
||||
int i, count, j, start, end;
|
||||
Scheme_Bucket **bs, *b;
|
||||
Scheme_Object **exsns = pt->provide_src_names, **exis;
|
||||
int exvcount = pt->num_var_provides, exicount;
|
||||
int exicount;
|
||||
Scheme_Bucket_Table *t;
|
||||
|
||||
if (!genv->toplevel)
|
||||
if (vars) {
|
||||
start = 0;
|
||||
end = pt->num_var_provides;
|
||||
} else {
|
||||
start = pt->num_var_provides;
|
||||
end = pt->num_provides;
|
||||
}
|
||||
|
||||
if (vars)
|
||||
t = genv->toplevel;
|
||||
else
|
||||
t = genv->syntax;
|
||||
|
||||
|
||||
if (!t)
|
||||
count = 0;
|
||||
else {
|
||||
bs = genv->toplevel->buckets;
|
||||
for (count = 0, i = genv->toplevel->size; i--; ) {
|
||||
bs = t->buckets;
|
||||
for (count = 0, i = t->size; i--; ) {
|
||||
b = bs[i];
|
||||
if (b && b->val)
|
||||
count++;
|
||||
|
|
@ -6955,7 +6986,7 @@ static Scheme_Object **compute_indirects(Scheme_Env *genv,
|
|||
|
||||
exis = MALLOC_N(Scheme_Object *, count);
|
||||
|
||||
for (count = 0, i = genv->toplevel->size; i--; ) {
|
||||
for (count = 0, i = t->size; i--; ) {
|
||||
b = bs[i];
|
||||
if (b && b->val) {
|
||||
Scheme_Object *name;
|
||||
|
|
@ -6963,12 +6994,12 @@ static Scheme_Object **compute_indirects(Scheme_Env *genv,
|
|||
name = (Scheme_Object *)b->key;
|
||||
|
||||
/* If the name is directly provided, no need for indirect... */
|
||||
for (j = 0; j < exvcount; j++) {
|
||||
for (j = start; j < end; j++) {
|
||||
if (SAME_OBJ(name, exsns[j]))
|
||||
break;
|
||||
}
|
||||
|
||||
if (j == exvcount)
|
||||
if (j == end)
|
||||
exis[count++] = name;
|
||||
}
|
||||
}
|
||||
|
|
@ -9099,6 +9130,14 @@ static Scheme_Object *write_module(Scheme_Object *obj)
|
|||
}
|
||||
l = cons(v, l);
|
||||
|
||||
count = m->num_indirect_syntax_provides;
|
||||
l = cons(scheme_make_integer(count), l);
|
||||
v = scheme_make_vector(count, NULL);
|
||||
for (i = 0; i < count; i++) {
|
||||
SCHEME_VEC_ELS(v)[i] = m->indirect_syntax_provides[i];
|
||||
}
|
||||
l = cons(v, l);
|
||||
|
||||
count = m->num_indirect_et_provides;
|
||||
l = cons(scheme_make_integer(count), l);
|
||||
v = scheme_make_vector(count, NULL);
|
||||
|
|
@ -9249,6 +9288,24 @@ static Scheme_Object *read_module(Scheme_Object *obj)
|
|||
|
||||
count = SCHEME_INT_VAL(nie);
|
||||
|
||||
if (!SCHEME_VECTORP(ie) || (SCHEME_VEC_SIZE(ie) != count)) return_NULL();
|
||||
v = MALLOC_N(Scheme_Object *, count);
|
||||
for (i = 0; i < count; i++) {
|
||||
v[i] = SCHEME_VEC_ELS(ie)[i];
|
||||
}
|
||||
m->indirect_syntax_provides = v;
|
||||
m->num_indirect_syntax_provides = count;
|
||||
|
||||
if (!SCHEME_PAIRP(obj)) return_NULL();
|
||||
ie = SCHEME_CAR(obj);
|
||||
obj = SCHEME_CDR(obj);
|
||||
|
||||
if (!SCHEME_PAIRP(obj)) return_NULL();
|
||||
nie = SCHEME_CAR(obj);
|
||||
obj = SCHEME_CDR(obj);
|
||||
|
||||
count = SCHEME_INT_VAL(nie);
|
||||
|
||||
if (!SCHEME_VECTORP(ie) || (SCHEME_VEC_SIZE(ie) != count)) return_NULL();
|
||||
v = MALLOC_N(Scheme_Object *, count);
|
||||
for (i = 0; i < count; i++) {
|
||||
|
|
|
|||
|
|
@ -2346,6 +2346,8 @@ static int module_val_MARK(void *p) {
|
|||
gcMARK(m->provide_protects);
|
||||
gcMARK(m->indirect_provides);
|
||||
|
||||
gcMARK(m->indirect_syntax_provides);
|
||||
|
||||
gcMARK(m->et_provide_protects);
|
||||
gcMARK(m->et_indirect_provides);
|
||||
|
||||
|
|
@ -2390,6 +2392,8 @@ static int module_val_FIXUP(void *p) {
|
|||
gcFIXUP(m->provide_protects);
|
||||
gcFIXUP(m->indirect_provides);
|
||||
|
||||
gcFIXUP(m->indirect_syntax_provides);
|
||||
|
||||
gcFIXUP(m->et_provide_protects);
|
||||
gcFIXUP(m->et_indirect_provides);
|
||||
|
||||
|
|
|
|||
|
|
@ -937,6 +937,8 @@ module_val {
|
|||
gcMARK(m->provide_protects);
|
||||
gcMARK(m->indirect_provides);
|
||||
|
||||
gcMARK(m->indirect_syntax_provides);
|
||||
|
||||
gcMARK(m->et_provide_protects);
|
||||
gcMARK(m->et_indirect_provides);
|
||||
|
||||
|
|
|
|||
|
|
@ -2557,6 +2557,10 @@ typedef struct Scheme_Module
|
|||
Scheme_Object **indirect_provides; /* symbols (internal names) */
|
||||
int num_indirect_provides;
|
||||
|
||||
/* Only if needed to reconstruct the renaming: */
|
||||
Scheme_Object **indirect_syntax_provides; /* symbols (internal names) */
|
||||
int num_indirect_syntax_provides;
|
||||
|
||||
char *et_provide_protects; /* 1 => protected, 0 => not */
|
||||
Scheme_Object **et_indirect_provides; /* symbols (internal names) */
|
||||
int num_indirect_et_provides;
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
consistently.)
|
||||
*/
|
||||
|
||||
#define MZSCHEME_VERSION "4.1.3.4"
|
||||
#define MZSCHEME_VERSION "4.1.3.5"
|
||||
|
||||
#define MZSCHEME_VERSION_X 4
|
||||
#define MZSCHEME_VERSION_Y 1
|
||||
#define MZSCHEME_VERSION_Z 3
|
||||
#define MZSCHEME_VERSION_W 4
|
||||
#define MZSCHEME_VERSION_W 5
|
||||
|
||||
#define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
|
||||
#define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user