From 9951950197164926c6b67743a7fe2739b120c5d0 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 24 Feb 2012 22:45:00 -0800
Subject: [PATCH] Always wrap multiple statements in stdin with (begin ...).

---
 src/etc/compile-boot-compiler.sh | 27 +++++++++++++++------------
 src/etc/compile-svm.sh           | 16 +++++++++-------
 src/etc/compile.sh               | 21 ++++++++++++---------
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
index cbafc486f..d7f7d9010 100755
--- a/src/etc/compile-boot-compiler.sh
+++ b/src/etc/compile-boot-compiler.sh
@@ -34,9 +34,10 @@ else
 fi
 
 run_cmd "${EXE}" --batch-mode <<EOF
-(load "etc/compile.scm")
-(compile-cref compile-dir)
-(for-each compile-dir '("runtime" "star-parser" "sf"))
+(begin
+  (load "etc/compile.scm")
+  (compile-cref compile-dir)
+  (for-each compile-dir '("runtime" "star-parser" "sf")))
 EOF
 
 FASL=`get_fasl_file`
@@ -46,10 +47,11 @@ EOF
 echo ""
 
 run_cmd "${EXE}" --batch-mode --library lib --band x-runtime.com <<EOF
-(load-option 'SF)
-(with-working-directory-pathname "compiler"
-  (lambda ()
-    (load "compiler.sf")))
+(begin
+  (load-option 'SF)
+  (with-working-directory-pathname "compiler"
+    (lambda ()
+      (load "compiler.sf"))))
 EOF
 
 run_cmd "${EXE}" --batch-mode <<EOF
@@ -59,11 +61,12 @@ run_cmd "${EXE}" --batch-mode <<EOF
 EOF
 
 run_cmd "${EXE}" --batch-mode --library lib --band x-runtime.com <<EOF
-(load-option 'SF)
-(load-option 'CREF)
-(load-option '*PARSER)
-(load-option 'COMPILER)
-(disk-save "lib/x-compiler.com")
+(begin
+  (load-option 'SF)
+  (load-option 'CREF)
+  (load-option '*PARSER)
+  (load-option 'COMPILER)
+  (disk-save "lib/x-compiler.com"))
 EOF
 
 # Remove host (native) code to STAGEX/ subdirs.
diff --git a/src/etc/compile-svm.sh b/src/etc/compile-svm.sh
index 875f0c4b2..248736773 100755
--- a/src/etc/compile-svm.sh
+++ b/src/etc/compile-svm.sh
@@ -62,8 +62,9 @@ EOF
 echo "#    Re-syntax cross-compiler using x-runtime.com."
 run_cmd_in_dir compiler \
     "${@}" --batch-mode --library ../lib --band x-runtime.com <<EOF
-(load "compiler.sf")
-(sf "base/crsend")
+(begin
+  (load "compiler.sf")
+  (sf "base/crsend"))
 EOF
 
 if [ -s compiler/compiler-unx.crf ]; then
@@ -76,11 +77,12 @@ run_cmd_in_dir compiler "${@}" --batch-mode --load compiler.cbf </dev/null
 
 echo "# Dump cross-compiler into x-compiler.com."
 run_cmd "${@}" --batch-mode --library lib --band x-runtime.com <<EOF
-(load-option 'SF)
-(load-option 'CREF)
-(load-option '*PARSER)
-(load-option 'COMPILER)
-(disk-save "lib/x-compiler.com")
+(begin
+  (load-option 'SF)
+  (load-option 'CREF)
+  (load-option '*PARSER)
+  (load-option 'COMPILER)
+  (disk-save "lib/x-compiler.com"))
 EOF
 
 echo "# Remove host code to STAGEX/ subdirs."
diff --git a/src/etc/compile.sh b/src/etc/compile.sh
index dd11ef8bd..d395940f3 100755
--- a/src/etc/compile.sh
+++ b/src/etc/compile.sh
@@ -27,9 +27,10 @@ set -e
 . etc/functions.sh
 
 run_cmd "${@}"<<EOF
-(load "etc/compile.scm")
-(compile-cref compile-dir)
-(for-each compile-dir '("runtime" "star-parser" "sf"))
+(begin
+  (load "etc/compile.scm")
+  (compile-cref compile-dir)
+  (for-each compile-dir '("runtime" "star-parser" "sf")))
 EOF
 
 FASL=`get_fasl_file`
@@ -40,9 +41,10 @@ EOF
 
 # Syntax the new compiler in fresh (compiler) packages.  Use the new sf too.
 run_cmd ./microcode/scheme --batch-mode --library lib --band runtime.com <<EOF
-(load-option 'SF)
-(with-working-directory-pathname "compiler/"
-  (lambda () (load "compiler.sf")))
+(begin
+  (load-option 'SF)
+  (with-working-directory-pathname "compiler/"
+    (lambda () (load "compiler.sf"))))
 EOF
 
 run_cmd "${@}"<<EOF
@@ -51,7 +53,8 @@ run_cmd "${@}"<<EOF
 EOF
 
 run_cmd ./microcode/scheme --batch-mode --library lib --band runtime.com <<EOF
-(load-option 'COMPILER)
-(load "etc/compile.scm")
-(compile-remaining-dirs compile-dir)
+(begin
+  (load-option 'COMPILER)
+  (load "etc/compile.scm")
+  (compile-remaining-dirs compile-dir))
 EOF
-- 
2.25.1