diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-23 05:33:12 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-23 05:33:12 +0000 |
| commit | 956bc9cce88ce71cdb46e3ecb9d9e1c1753dc601 (patch) | |
| tree | 291a8d233d93f76f624c92575cc190203647ba61 /src | |
| parent | dbeb8d5ae59cfa7da8997a09ad27e4efc04d0eaf (diff) | |
| download | open-axiom-956bc9cce88ce71cdb46e3ecb9d9e1c1753dc601.tar.gz | |
* interp/bootlex.lisp (spad): Don't bind $noSubsumption.
* interp/i-spec1.boot (evalCOLLECT): Fix thinko.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/bootlex.lisp | 3 | ||||
| -rw-r--r-- | src/interp/i-spec1.boot | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 305a1291..0156f61d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-06-23 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/bootlex.lisp (spad): Don't bind $noSubsumption. + * interp/i-spec1.boot (evalCOLLECT): Fix thinko. + 2009-06-20 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/category.boot (SigOpsubsume): Remove as unused. 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)) |