diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 2 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 3 | ||||
| -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 |
6 files changed, 12 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6135f3b8..82abe67a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2008-02-20 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/i-coerce.boot (coerceInt1): Avoid misguided + Tuple coercion behind the scene. + * interp/Makefile.pamphlet (astr.$(FASLEXT)): Depend on + vmlisp.$(FASLEXT) instead. + + * algebra/Makefile.pamphlet (.NOTPARALLEL): Remove rectriction. + +2008-02-20 Gabriel Dos Reis <gdr@cs.tamu.edu> + * lisp/core.lisp.in [SBCL]: Require "sb-posix". (|resetErrorCount|): New export function. * interp/vmlisp.lisp (opOf): Remove macro definition. diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 7405a9d1..0facdd73 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -857,7 +857,7 @@ axiom_algebra_layer_user_objects = \ $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_user))) # The algebra build is not yet ready for parallel build. -.NOTPARALLEL: +#.NOTPARALLEL: .PHONY: all all-algebra mkdir-output-directory all: all-ax diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 4e791a38..c99e06f7 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -2283,9 +2283,6 @@ subdir = src/algebra/ <<layer23>> <<USERLAYER>> -# The algebra build is not yet ready for parallel build. -.NOTPARALLEL: - .PHONY: all all-algebra mkdir-output-directory all: all-ax 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) |