- cmucl-cvs - mailman3.common-lisp.net

[cmucl-cvs] CMUCL commit: src/general-info (release-20c.txt)
by Raymond Toy 29 Jun '11

29 Jun '11

Date: Tuesday, June 28, 2011 @ 17:58:41 Author: rtoy Path: /project/cmucl/cvsroot/src/general-info Modified: release-20c.txt o Trac #43 fixed again. o Add note about build-all.sh. -----------------+ release-20c.txt | 6 ++++++ 1 file changed, 6 insertions(+) Index: src/general-info/release-20c.txt diff -u src/general-info/release-20c.txt:1.25 src/general-info/release-20c.txt:1.26 --- src/general-info/release-20c.txt:1.25 Mon Jun 27 08:47:53 2011 +++ src/general-info/release-20c.txt Tue Jun 28 17:58:41 2011 @@ -136,12 +136,18 @@ * Trac Tickets: + - #43: unread-char doesn't change file-position + Fixed. * Other changes: * Improvements to the PCL implementation of CLOS: * Changes to building procedure: + - A new script, src/tools/build-all.sh, has been added. This will + compile all variants for a given OS and architecture. That is, + both x87 and sse2 binaries are built (if available) as well as + unicode and non-unicode versions. This release is not binary compatible with code compiled using CMUCL 20b; you will need to recompile FASL files.

1 0

[cmucl-cvs] CMUCL commit: src/code (fd-stream.lisp stream.lisp)
by Raymond Toy 29 Jun '11

29 Jun '11

Date: Tuesday, June 28, 2011 @ 17:55:05 Author: rtoy Path: /project/cmucl/cvsroot/src/code Modified: fd-stream.lisp stream.lisp Fix Trac #43 again. stream.lisp: o Remove the old code that was the first attempt at fixing issue #43. This was wrong. fd-stream.lisp: o Fix issue #43. Even if we have a string-buffer, we need to take into account any octets in the in-buffer (if it exists) that have not been processed. This happens if the in-buffer does not have enough octets at the end to form a complete character for the given encoding. o Some debugging prints added, but disabled. ----------------+ fd-stream.lisp | 75 +++++++++++++++++++++++++++++++++---------------------- stream.lisp | 8 ----- 2 files changed, 46 insertions(+), 37 deletions(-) Index: src/code/fd-stream.lisp diff -u src/code/fd-stream.lisp:1.124 src/code/fd-stream.lisp:1.125 --- src/code/fd-stream.lisp:1.124 Tue May 31 06:14:39 2011 +++ src/code/fd-stream.lisp Tue Jun 28 17:55:04 2011 @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.124 2011/05/31 13:14:39 rtoy Exp $") + "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.125 2011/06/29 00:55:04 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1717,35 +1717,50 @@ (fd-stream-ibuf-head stream))) #+unicode - (if (fd-stream-string-buffer stream) - ;; The string buffer contains Lisp characters, - ;; not octets! To figure out how many octets - ;; have not been already supplied, we need to - ;; count how many octets were consumed for all - ;; the characters in the string bbuffer that have - ;; not been supplied. - (let ((ocount (fd-stream-octet-count stream))) - (when ocount - ;; Note: string-index starts at 1 (because - ;; index 0 is for the unread-char), but - ;; octet-count doesn't use that. Hence, - ;; subtract one from string-index and - ;; string-buffer-len. - (loop for k of-type fixnum from (1- (fd-stream-string-index stream)) - below (1- (fd-stream-string-buffer-len stream)) - do (decf posn (aref ocount k))))) - (when (fd-stream-in-buffer stream) - ;; When we have an in-buffer (but no - ;; string-buffer!), we need to adjust for the - ;; octets that have not yet been supplied. - ;; This situation (should!) only happens for an - ;; external-format of ISO-8859-1. If there's - ;; no string-buffer and no in-buffer, then the - ;; ibuf tail and head pointers contain all the - ;; information needed. - (decf posn (- in-buffer-length - (fd-stream-in-index stream))))) - + (when (fd-stream-string-buffer stream) + ;; The string buffer contains Lisp characters, + ;; not octets! To figure out how many octets + ;; have not been already supplied, we need to + ;; count how many octets were consumed for all + ;; the characters in the string bbuffer that have + ;; not been supplied. + (let ((ocount (fd-stream-octet-count stream))) + (when ocount + ;; Note: string-index starts at 1 (because + ;; index 0 is for the unread-char), but + ;; octet-count doesn't use that. Hence, + ;; subtract one from string-index and + ;; string-buffer-len. + #+nil + (progn + (format t "~&ocount = ~D~%" ocount) + (format t "posn = ~D~%" posn)) + (loop for k of-type fixnum from (1- (fd-stream-string-index stream)) + below (1- (fd-stream-string-buffer-len stream)) + do (decf posn (aref ocount k))) + #+nil + (progn + (format t "new posn = ~D~%" posn) + (format t "in-buffer-length = ~D~%" in-buffer-length) + (format t "fd-stream-in-index = ~D~%" (fd-stream-in-index stream)))))) + (when (fd-stream-in-buffer stream) + ;; When we have an in-buffer (whether we have a + ;; string-buffer or not!), we need to adjust for + ;; the octets that have not yet been supplied. + ;; (This case happens with string-buffer when the + ;; in-buffer does not have enough octets to form a + ;; complete character.) If there's no + ;; string-buffer and no in-buffer, then the ibuf + ;; tail and head pointers contain all the + ;; information needed. + #+nil + (progn + (format t "in-buffer-length = ~D~%" in-buffer-length) + (format t "fd-stream-in-index = ~D~%" (fd-stream-in-index stream))) + (decf posn (- in-buffer-length + (fd-stream-in-index stream)))) + #+nil + (format t "fd-stream-unread = ~S~%" (fd-stream-unread stream)) (when (fd-stream-unread stream) ;;@@ (decf posn)) ;; Divide bytes by element size. Index: src/code/stream.lisp diff -u src/code/stream.lisp:1.101 src/code/stream.lisp:1.102 --- src/code/stream.lisp:1.101 Mon Jun 27 08:05:27 2011 +++ src/code/stream.lisp Tue Jun 28 17:55:04 2011 @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /project/cmucl/cvsroot/src/code/stream.lisp,v 1.101 2011/06/27 15:05:27 rtoy Exp $") + "$Header: /project/cmucl/cvsroot/src/code/stream.lisp,v 1.102 2011/06/29 00:55:04 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -851,12 +851,6 @@ (setf (lisp-stream-string-buffer-len stream) (1+ char-count)) (setf (lisp-stream-string-index stream) 2) (setf (lisp-stream-in-index stream) octet-count) - ;; If we didn't convert all the octets, - ;; adjust the head pointer to indicate - ;; that we have unread octets left. - #+nil - (decf (lisp::fd-stream-ibuf-head stream) - (- (fd-stream-in-length stream) octet-count)) #+(or debug-frc-sr) (progn (format t "new in-index = ~A~%" (lisp-stream-in-index stream))

1 0

[cmucl-cvs] CMUCL commit: src/i18n/locale (cmucl.pot)
by Raymond Toy 28 Jun '11

28 Jun '11

Date: Tuesday, June 28, 2011 @ 12:20:10 Author: rtoy Path: /project/cmucl/cvsroot/src/i18n/locale Modified: cmucl.pot Regenerated from current sources. -----------+ cmucl.pot | 8 ++++++++ 1 file changed, 8 insertions(+) Index: src/i18n/locale/cmucl.pot diff -u src/i18n/locale/cmucl.pot:1.20 src/i18n/locale/cmucl.pot:1.21 --- src/i18n/locale/cmucl.pot:1.20 Mon Jun 6 12:28:10 2011 +++ src/i18n/locale/cmucl.pot Tue Jun 28 12:20:09 2011 @@ -5318,6 +5318,14 @@ msgid "Build the dictionary for CJK Unified Ideographs" msgstr "" +#: src/code/unidata.lisp +msgid "" +"Load all unicode data and set *UNIDATA-PATH* to NIL.\n" +"Normally, the unicode data is loaded as needed. This loads all of the\n" +"data, which is useful for creating a core that no longer needs\n" +"unidata.bin." +msgstr "" + #: src/code/char.lisp msgid "The upper exclusive bound on values produced by CHAR-CODE." msgstr ""

1 0

[cmucl-cvs] CMUCL commit: src/general-info (release-20c.txt)
by Raymond Toy 27 Jun '11

27 Jun '11

Date: Monday, June 27, 2011 @ 08:47:53 Author: rtoy Path: /project/cmucl/cvsroot/src/general-info Modified: release-20c.txt Update from logs. o Unicode updated to version 6.0.0. o Trac #43 repoened because that change was reverted. -----------------+ release-20c.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Index: src/general-info/release-20c.txt diff -u src/general-info/release-20c.txt:1.24 src/general-info/release-20c.txt:1.25 --- src/general-info/release-20c.txt:1.24 Fri Jun 10 12:34:58 2011 +++ src/general-info/release-20c.txt Mon Jun 27 08:47:53 2011 @@ -21,7 +21,7 @@ * Known issues: * Feature enhancements - - Update to Unicode 5.2.0. + - Update to Unicode 6.0.0. - Add support for character name completion. This can be used by Slime to do character name completion. - Initial support for Solaris/x86. CMUCL will run on Solaris/x86 @@ -136,8 +136,6 @@ * Trac Tickets: - - #43: unread-char doesn't change file-position - Fixed. * Other changes:

1 0

[cmucl-cvs] CMUCL commit: src/tools (make-src-dist.sh)
by Raymond Toy 27 Jun '11

27 Jun '11

Date: Monday, June 27, 2011 @ 08:45:19 Author: rtoy Path: /project/cmucl/cvsroot/src/tools Modified: make-src-dist.sh Usability and internal restructuring. o Add usage message. o Don't include the emacs-style backup files that are sometimes created for the pot files. ------------------+ make-src-dist.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) Index: src/tools/make-src-dist.sh diff -u src/tools/make-src-dist.sh:1.2 src/tools/make-src-dist.sh:1.3 --- src/tools/make-src-dist.sh:1.2 Thu Aug 13 18:31:11 2009 +++ src/tools/make-src-dist.sh Mon Jun 27 08:45:19 2011 @@ -1,5 +1,17 @@ #!/bin/sh +usage() { + echo "make-src-dist.sh: [-bgh] [-t gnutar] [-I destdir] version" + echo " -h This help" + echo " -b Use bzip2 compression" + echo " -g Use gzip compression" + echo " -t tar Name/path to GNU tar" + echo " -I destdir Install directly to given directory instead of creating a tarball" + echo "" + echo 'Create a tar ball of the cmucl sources. The tarball is named ' + echo 'cmucl-src-$version.tar.bz2 (or gz if using gzip compression)' +} + while getopts "bgh?t:I:" arg do case $arg in @@ -25,10 +37,11 @@ ZIPEXT="bz2" fi +GTAR_OPTIONS="--exclude=CVS --exclude='*.pot.~*~'" if [ -z "$INSTALL_DIR" ]; then echo " Compressing with $ZIP" - ${GTAR:-tar} --exclude=CVS -cf - src | ${ZIP} > cmucl-src-$VERSION.tar.$ZIPEXT + ${GTAR:-tar} ${GTAR_OPTIONS} -cf - src | ${ZIP} > cmucl-src-$VERSION.tar.$ZIPEXT else # Install in the specified directory - ${GTAR:-tar} --exclude=CVS -cf - src | (cd $INSTALL_DIR; ${GTAR:-tar} xf -) + ${GTAR:-tar} ${GTAR_OPTIONS} -cf - src | (cd $INSTALL_DIR; ${GTAR:-tar} xf -) fi

1 0

[cmucl-cvs] CMUCL commit: src/i18n (unidata.bin)
by Raymond Toy 27 Jun '11

27 Jun '11

Date: Monday, June 27, 2011 @ 08:18:14 Author: rtoy Path: /project/cmucl/cvsroot/src/i18n Modified: unidata.bin Regenerated for Unicode 6.0.0. -------------+ unidata.bin | <<Binary file>> 1 file changed, 1 insertion(+) Index: src/i18n/unidata.bin <<Binary file>>

1 0

[cmucl-cvs] CMUCL commit: src (12 files)
by Raymond Toy 27 Jun '11

27 Jun '11

Date: Monday, June 27, 2011 @ 08:11:30 Author: rtoy Path: /project/cmucl/cvsroot/src Modified: code/unidata.lisp i18n/CaseFolding.txt i18n/CompositionExclusions.txt i18n/DerivedNormalizationProps.txt i18n/NameAliases.txt i18n/NormalizationCorrections.txt i18n/SpecialCasing.txt i18n/UnicodeData.txt i18n/WordBreakProperty.txt i18n/tests/NormalizationTest.txt i18n/tests/WordBreakTest.txt tools/build-unidata.lisp Update to Unicode 6.0.0. code/unidata.lisp: o Update unicode version to 6.0.0 o Add pointer to build-unidata.lisp. tools/build-unidata.lisp: o Update unicode version to 6.0.0 o Print out directory path so we can see where we're getting the data from. i18n/CaseFolding.txt i18n/CompositionExclusions.txt i18n/DerivedNormalizationProps.txt i18n/NameAliases.txt i18n/NormalizationCorrections.txt i18n/SpecialCasing.txt i18n/UnicodeData.txt i18n/WordBreakProperty.txt i18n/tests/NormalizationTest.txt i18n/tests/WordBreakTest.txt: o Update with new files from unicode.org. ------------------------------------+ code/unidata.lisp | 11 i18n/CaseFolding.txt | 15 i18n/CompositionExclusions.txt | 27 i18n/DerivedNormalizationProps.txt | 163 ++- i18n/NameAliases.txt | 6 i18n/NormalizationCorrections.txt | 6 i18n/SpecialCasing.txt | 6 i18n/UnicodeData.txt | 1886 ++++++++++++++++++++++++++++++++++- i18n/WordBreakProperty.txt | 81 + i18n/tests/NormalizationTest.txt | 73 + i18n/tests/WordBreakTest.txt | 8 tools/build-unidata.lisp | 8 12 files changed, 2173 insertions(+), 117 deletions(-) The diff is longer than the limit of 200KB.

1 0

[cmucl-cvs] CMUCL commit: src/code (stream.lisp)
by Raymond Toy 27 Jun '11

27 Jun '11

Date: Monday, June 27, 2011 @ 08:05:27 Author: rtoy Path: /project/cmucl/cvsroot/src/code Modified: stream.lisp Revert last change to fix Trac #43. That changes causes the Unicode normalization and word-break tests to fail. I do not know why this causes the tests to fail, but it causes the test program to suck in the entire file into a string instead of just one line. -------------+ stream.lisp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: src/code/stream.lisp diff -u src/code/stream.lisp:1.100 src/code/stream.lisp:1.101 --- src/code/stream.lisp:1.100 Thu Mar 3 08:43:28 2011 +++ src/code/stream.lisp Mon Jun 27 08:05:27 2011 @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /project/cmucl/cvsroot/src/code/stream.lisp,v 1.100 2011/03/03 16:43:28 rtoy Exp $") + "$Header: /project/cmucl/cvsroot/src/code/stream.lisp,v 1.101 2011/06/27 15:05:27 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -854,6 +854,7 @@ ;; If we didn't convert all the octets, ;; adjust the head pointer to indicate ;; that we have unread octets left. + #+nil (decf (lisp::fd-stream-ibuf-head stream) (- (fd-stream-in-length stream) octet-count)) #+(or debug-frc-sr)

1 0

[cmucl-cvs] CMUCL commit: cmucl-www/cmucl-www (build.el)
by Raymond Toy 21 Jun '11

21 Jun '11

Date: Tuesday, June 21, 2011 @ 06:05:49 Author: rtoy Path: /project/cmucl/cvsroot/cmucl-www/cmucl-www Modified: build.el Fix relative html links. I don't know why this no longer works but after the upgrade to common-lisp.net, the generated web pages no longer work on either common-lisp.net or www.cons.org/cmucl. By changing "../" to "./" we get a working copy on common-lisp.net now. (Actually the setup of the webserver on common-lisp.net caused this to fail. But www.cons.org hasn't changed so I don't know why that fails now.) ----------+ build.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: cmucl-www/cmucl-www/build.el diff -u cmucl-www/cmucl-www/build.el:1.9 cmucl-www/cmucl-www/build.el:1.10 --- cmucl-www/cmucl-www/build.el:1.9 Wed Sep 29 16:59:58 2010 +++ cmucl-www/cmucl-www/build.el Tue Jun 21 06:05:49 2011 @@ -92,7 +92,7 @@ (defun wb-home-as-relative-url (path-components) (loop for path in path-components unless (string-match "\\.html\\'" path) - concat "../")) + concat "./")) ;; generate a title string for STR, from the information in ;; `wb-jumpbar-titles' if present, else defaulting to the file's

1 0

[cmucl-cvs] CMUCL commit: src/general-info (release-20c.txt)
by Raymond Toy 10 Jun '11

10 Jun '11

Date: Friday, June 10, 2011 @ 12:34:59 Author: rtoy Path: /project/cmucl/cvsroot/src/general-info Modified: release-20c.txt o Update for recent change. o Update the version number for ASDF. -----------------+ release-20c.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: src/general-info/release-20c.txt diff -u src/general-info/release-20c.txt:1.23 src/general-info/release-20c.txt:1.24 --- src/general-info/release-20c.txt:1.23 Fri Jun 10 10:38:27 2011 +++ src/general-info/release-20c.txt Fri Jun 10 12:34:58 2011 @@ -28,7 +28,7 @@ with all features available, except only Unicode is supported. * Changes - - ASDF2 updated to version 2.014.1. + - ASDF2 updated to version 2.016. - COMPILE-FILE now accepts a :DECODING-ERROR argument that indicates how to handle decoding errors when reading the file. It has the same meaning and effect as the :DECODING-ERROR @@ -54,6 +54,9 @@ - Add LISP:LOAD-ALL-UNICODE-DATA to load all the Unicode information into core. This is useful for creating an executable image that does not need unidata.bin. + - CMUCL no longer exits if you specify a core file with an + executable image. A warning is printed instead and the core + file is used. * ANSI compliance fixes: - Fixes for signaling errors with READ-CHAR and READ-BYTE

1 0