diff --git a/README-FIRST.txt b/README-FIRST.txt index b81e335a..988a752b 100644 --- a/README-FIRST.txt +++ b/README-FIRST.txt @@ -27,14 +27,14 @@ you may need to install some 32-bit libraries or (on Windows) allow Larceny to opt out of DEP. See doc/HOWTO-INSTALL. Petit Larceny (Linux, Mac OS X): ensure that the GNU C Compiler (gcc) - is in your execution path. (If you are building from source, see - doc/HOWTO-BUILD.) +is in your execution path. (If you are building from source, see +doc/HOWTO-BUILD.) Mac OS X: Use Apple's Developer Tools, http://developer.apple.com/ - After gcc is in your execution path, you should install - the R7RS runtime and standard libraries by performing - step 4 of the process described in doc/HOWTO-BUILD. + Petit Larceny only: After gcc is in your execution path, + you should install the R7RS runtime and standard libraries + by performing step 4 of the process described in doc/HOWTO-BUILD. QUICK START @@ -51,12 +51,12 @@ Win32: EXECUTION MODES R5RS traditional read/eval/print loop (the default) - ERR5RS see doc/HOWTO-ERR5RS R6RS see doc/HOWTO-R6RS + R7RS see doc/HOWTO-R7RS Scheme script see doc/HOWTO-SCRIPT The precompiled distributions of native Larceny should work -out of the box in all four modes, but the ERR5RS, R6RS, and +out of the box in all four modes, but the R6RS, R7RS, and Scheme script modes will not work in Petit Larceny until you have performed step 4 of the process described in doc/HOWTO-BUILD. @@ -82,10 +82,9 @@ To precompile files that contain R5RS Scheme code: - (load "target.fasl") loads the compiled code in "target.fasl" -To precompile ERR5RS/R6RS libraries, top-level programs, and -Scheme scripts, use the compile-stale Scheme script that is -in Larceny's root directory. Please see the Larceny User -Manual [3] for details. +To precompile R7RS/R6RS libraries, programs, and Scheme scripts, +use the compile-stale Scheme script that is in Larceny's root +directory. Please see the Larceny User Manual [3] for details. FURTHER READING diff --git a/test/Benchmarking/R6RS/bench b/test/Benchmarking/R6RS/bench index 05121e0b..9c21796d 100755 --- a/test/Benchmarking/R6RS/bench +++ b/test/Benchmarking/R6RS/bench @@ -94,9 +94,11 @@ setup () LARCENY=${LARCENY:-"../../../larceny"} PETIT=${PETIT:-"../../../petit-larceny"} PLTR6RS=${PLTR6RS:-"plt-r6rs"} + RACKET=${RACKET:-"plt-r6rs"} YPSILON=${YPSILON:-"ypsilon"} MOSH=${MOSH:-"mosh"} PETITE=${PETITE:-"petite"} + VICARE=${VICARE:-"vicare"} } @@ -118,6 +120,8 @@ Usage: bench [-r runs] petit for Petit Larceny petite for Petite Chez plt for PLT Scheme + racket for Racket + vicare for Vicare ypsilon for Ypsilon all for all of the above @@ -246,6 +250,19 @@ plt_exec () time "${PLTR6RS}" "$1" < "$2" } +# ----------------------------------------------------------------------------- +# Definitions specific to Racket + +racket_comp () +{ + echo | time "${RACKET}" --compile "$1" +} + +racket_exec () +{ + time "${RACKET}" "$1" < "$2" +} + # ----------------------------------------------------------------------------- # Definitions specific to Ypsilon @@ -285,6 +302,19 @@ petite_exec () time "${PETITE}" --optimize-level 2 --program "$1" < "$2" } +# ----------------------------------------------------------------------------- +# Definitions specific to Vicare + +vicare_comp () +{ + : +} + +vicare_exec () +{ + time "${VICARE}" --r6rs-script "$1" < "$2" +} + # ----------------------------------------------------------------------------- ## Arg processing... @@ -379,6 +409,16 @@ for system in $systems ; do EXECCOMMANDS="" ;; + racket) NAME='Racket' + COMP=racket_comp + EXEC=racket_exec + COMPOPTS="" + EXTENSION="sch" + EXTENSIONCOMP="sch" + COMPCOMMANDS="" + EXECCOMMANDS="" + ;; + ypsilon) NAME='Ypsilon' # copied from Ikarus' settings... COMP=ypsilon_comp EXEC=ypsilon_exec @@ -409,6 +449,16 @@ for system in $systems ; do EXECCOMMANDS="" ;; + vicare) NAME='Vicare' + COMP=vicare_comp + EXEC=vicare_exec + COMPOPTS="" + EXTENSION="sch" + EXTENSIONCOMP="sch" + COMPCOMMANDS="" + EXECCOMMANDS="" + ;; + esac {