CMUCL commit: src (4 files)

[Raymond Toy]

    Date: Tuesday, July 20, 2010 @ 17:34:30
  Author: rtoy
    Path: /project/cmucl/cvsroot/src

   Added: code/fd-stream-comp.lisp
Modified: code/fd-stream-extfmt.lisp tools/worldcom.lisp tools/worldload.lisp

Need to precompile the ef slots for both unicode and non-unicode
builds.  (This was broken in the 2010-04 snapshot.)

code/fd-stream-comp.lisp:
o Precompile ef slots there for ISO8859-1.

code/fd-stream-extfmts.lisp:
o Remove the precompile stuff.

tools/worldcom.lisp:
o Compile fd-stream-comp.

tools/worldload.lisp:
o Load fd-stream-comp.


----------------------------+
 code/fd-stream-comp.lisp   |   29 +++++++++++++++++++++++++++++
 code/fd-stream-extfmt.lisp |    9 +--------
 tools/worldcom.lisp        |    3 ++-
 tools/worldload.lisp       |    4 +++-
 4 files changed, 35 insertions(+), 10 deletions(-)


Index: src/code/fd-stream-comp.lisp
diff -u /dev/null src/code/fd-stream-comp.lisp:1.1
--- /dev/null	Tue Jul 20 17:34:30 2010
+++ src/code/fd-stream-comp.lisp	Tue Jul 20 17:34:29 2010
@@ -0,0 +1,29 @@
+;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Package: LISP -*-
+;;;
+;;; **********************************************************************
+;;; This has been placed in the public domain.
+;;; 
+(ext:file-comment
+ "$Header: /project/cmucl/cvsroot/src/code/fd-stream-comp.lisp,v 1.1 2010-07-20 21:34:29 rtoy Exp $")
+;;;
+;;; **********************************************************************
+;;;
+;;; Precompile builtin external-formats.
+
+(in-package "LISP")
+
+(intl:textdomain "cmucl")
+
+;; The external format :iso8859-1 is builtin so we want all of the
+;; basic methods to be compiled so that they don't have to be compiled
+;; at runtime.  There are issues if we don't do this.
+;;
+;; These are needed for both unicode and non-unicode Lisps.
+(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-cin+)
+(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-cout+)
+(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-sout+)
+(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-os+)
+(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-so+)
+(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-en+)
+(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-de+)
+
Index: src/code/fd-stream-extfmt.lisp
diff -u src/code/fd-stream-extfmt.lisp:1.9 src/code/fd-stream-extfmt.lisp:1.10
--- src/code/fd-stream-extfmt.lisp:1.9	Thu Jul  1 22:50:35 2010
+++ src/code/fd-stream-extfmt.lisp	Tue Jul 20 17:34:29 2010
@@ -5,7 +5,7 @@
 ;;; domain.
 ;;; 
 (ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/code/fd-stream-extfmt.lisp,v 1.9 2010-07-02 02:50:35 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/code/fd-stream-extfmt.lisp,v 1.10 2010-07-20 21:34:29 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -119,12 +119,5 @@
     extfmt))
 
 
-(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-cin+)
-(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-cout+)
-(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-sout+)
-(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-os+)
-(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-so+)
-(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-en+)
-(stream::precompile-ef-slot :iso8859-1 #.stream::+ef-de+)
 
 (setf lisp::*enable-stream-buffer-p* t)
Index: src/tools/worldcom.lisp
diff -u src/tools/worldcom.lisp:1.103 src/tools/worldcom.lisp:1.104
--- src/tools/worldcom.lisp:1.103	Fri Mar 19 11:19:04 2010
+++ src/tools/worldcom.lisp	Tue Jul 20 17:34:30 2010
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group at cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/tools/worldcom.lisp,v 1.103 2010-03-19 15:19:04 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/tools/worldcom.lisp,v 1.104 2010-07-20 21:34:30 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -246,6 +246,7 @@
 (comf "target:code/fd-stream")
 (when (c:backend-featurep :unicode)
   (comf "target:code/fd-stream-extfmt"))
+(comf "target:code/fd-stream-comp")
 (comf "target:code/pathname")
 #-no-runtime (comf "target:code/pathname" :byte-compile t)
 (comf "target:code/filesys")
Index: src/tools/worldload.lisp
diff -u src/tools/worldload.lisp:1.111 src/tools/worldload.lisp:1.112
--- src/tools/worldload.lisp:1.111	Fri Mar 19 11:19:04 2010
+++ src/tools/worldload.lisp	Tue Jul 20 17:34:30 2010
@@ -6,7 +6,7 @@
 ;;; If you want to use this code or any part of CMU Common Lisp, please contact
 ;;; Scott Fahlman or slisp-group at cs.cmu.edu.
 ;;;
-;;; $Header: /project/cmucl/cvsroot/src/tools/worldload.lisp,v 1.111 2010-03-19 15:19:04 rtoy Exp $
+;;; $Header: /project/cmucl/cvsroot/src/tools/worldload.lisp,v 1.112 2010-07-20 21:34:30 rtoy Exp $
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -164,6 +164,8 @@
 #+(and unicode (not (or unicode-bootstrap no-compiler runtime)))
 (maybe-byte-load "code:fd-stream-extfmt")
 
+(maybe-byte-load "code:fd-stream-comp")
+
 (maybe-byte-load "target:code/intl")