diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-02-21 02:02:48 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-02-21 02:02:48 +0000 |
| commit | 3045578ca18746550988fa351fe62fe7bc92a703 (patch) | |
| tree | 6d9bfc0ac983f4708612f427f69a0f99c435e679 /src/interp | |
| parent | 7ba4cd656138bedb567137ea662f26213bc2e898 (diff) | |
| download | open-axiom-3045578ca18746550988fa351fe62fe7bc92a703.tar.gz | |
* interp/i-coerce.boot (coerceInt1): Avoid misguided
Tuple coercion behind the scene.
* interp/i-output.boot (output): Likewise.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/Makefile.in | 2 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 2 | ||||
| -rw-r--r-- | src/interp/i-coerce.boot | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 008453ac..7a37bcb2 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -601,7 +601,7 @@ intfile.$(FASLEXT): intfile.boot cstream.$(FASLEXT) cstream.$(FASLEXT): cstream.boot sys-macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< -astr.$(FASLEXT): astr.boot boot-pkg.$(FASLEXT) +astr.$(FASLEXT): astr.boot vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT) diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index bea38292..b8b67c5c 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -915,7 +915,7 @@ intfile.$(FASLEXT): intfile.boot cstream.$(FASLEXT) cstream.$(FASLEXT): cstream.boot sys-macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< -astr.$(FASLEXT): astr.boot boot-pkg.$(FASLEXT) +astr.$(FASLEXT): astr.boot vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT) diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index c5794562..bb331ea3 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -848,9 +848,6 @@ coerceInt1(triple,t2) == val' := unwrap val (t2 = val') and ((val' = t1) or (t1 = $String)) => objNew(val,t2) NIL - -- t1 is ['Tuple,S] and t2 ^= '(OutputForm) => - t1 is ['Tuple,S] => - coerceInt1(objNewWrap(asTupleAsList unwrap val, ['List, S]), t2) t1 is ['Union,:.] => coerceIntFromUnion(triple,t2) t2 is ['Union,:.] => coerceInt2Union(triple,t2) (STRINGP t1) and (t2 = $String) => objNew(val,$String) |