[Sbcl-commits] CVS: sbcl make-host-1.lisp, 1.1, 1.2 make-host-2.lisp, 1.4, 1.5 version.lisp-expr, 1.4071, 1.4072

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21640

Modified Files:
	make-host-1.lisp make-host-2.lisp version.lisp-expr 
Log Message:
1.0.20.2: Fewer XC/reader-conditional confusions
	Inspired by Josh Elasser (sbcl-devel 2008-08-29), write code
	that tries to be clever about reader conditionals in the 
	cross-compiler, in order to point out when a mistake is likely.
	... and fix the extra buglet that this reveals.


Index: make-host-1.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-host-1.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- make-host-1.lisp	29 Dec 2005 16:08:31 -0000	1.1
+++ make-host-1.lisp	4 Sep 2008 13:04:45 -0000	1.2
@@ -11,6 +11,10 @@
 (setf *host-obj-prefix* "obj/from-host/")
 (load "src/cold/set-up-cold-packages.lisp")
 (load "src/cold/defun-load-or-cload-xcompiler.lisp")
+
+(set-dispatch-macro-character #\# #\+ #'she-reader)
+(set-dispatch-macro-character #\# #\- #'she-reader)
+
 (load-or-cload-xcompiler #'host-cload-stem)
 
 ;;; Let's check that the type system, and various other things, are

Index: make-host-2.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-host-2.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- make-host-2.lisp	30 Jul 2008 17:58:39 -0000	1.4
+++ make-host-2.lisp	4 Sep 2008 13:04:45 -0000	1.5
@@ -50,6 +50,9 @@
     ;; toplevel forms in the xcompiler backq.lisp file?
     (set-macro-character #\` #'sb!impl::backquote-macro)
     (set-macro-character #\, #'sb!impl::comma-macro)
+
+    (set-dispatch-macro-character #\# #\+ #'she-reader)
+    (set-dispatch-macro-character #\# #\- #'she-reader)
     ;; Control optimization policy.
     (proclaim-target-optimization)
     ;; Specify where target machinery lives.

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.4071
retrieving revision 1.4072
diff -u -d -r1.4071 -r1.4072
--- version.lisp-expr	3 Sep 2008 18:59:53 -0000	1.4071
+++ version.lisp-expr	4 Sep 2008 13:04:45 -0000	1.4072
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.20.1"
+"1.0.20.2"