From 956bc9cce88ce71cdb46e3ecb9d9e1c1753dc601 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Tue, 23 Jun 2009 05:33:12 +0000
Subject: 	* interp/bootlex.lisp (spad): Don't bind $noSubsumption. 
 * interp/i-spec1.boot (evalCOLLECT): Fix thinko.

---
 src/interp/bootlex.lisp | 3 +--
 src/interp/i-spec1.boot | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp
index 4cd605d5..f430ffe1 100644
--- a/src/interp/bootlex.lisp
+++ b/src/interp/bootlex.lisp
@@ -94,10 +94,9 @@
            (*EOF* NIL)
            (File-Closed NIL)
            (/editfile *spad-input-file*)
-           (|$noSubsumption| |$noSubsumption|)
            in-stream out-stream)
   (declare (special echo-meta /editfile *comp370-apply* *EOF*
-                    File-Closed Xcape |$noSubsumption|))
+                    File-Closed Xcape))
   (setq |$InteractiveMode| nil)
   ;; only rebind |$InteractiveFrame| if compiling
   (progv (if (not |$InteractiveMode|) '(|$InteractiveFrame|))
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index f9b1fb60..a23aaffb 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -541,7 +541,7 @@ upLoopIterSTEP(index,lower,step,upperList) ==
 evalCOLLECT(op,[:itrl,body],m) ==
   iters := [evalLoopIter itr for itr in itrl]
   bod := getArgValue(body,computedMode body)
-  if bod isnt ['SPADCALL,:.] then bode := ['unwrap,bod]
+  if bod isnt ['SPADCALL,:.] then bod := ['unwrap,bod]
   code := timedOptimization asTupleNewCode0(second m, ['COLLECT,:iters,bod])
   if $genValue then code := wrap timedEVALFUN code
   putValue(op,objNew(code,m))
-- 
cgit v1.2.3