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

[Git][cmucl/cmucl][issue-367-count-octets-for-encoding] Make EF-OCTET-COUNT an inline function and add documentation
by Raymond Toy (＠rtoy) 13 Jan '25

13 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: 865a06b0 by Raymond Toy at 2025-01-12T17:45:18-08:00 Make EF-OCTET-COUNT an inline function and add documentation Like the other EF- functions, make EF-OCTET-COUNT an inline function. Add comments in define-external-format about the OCTET-COUNT slot. - - - - - 1 changed file: - src/code/extfmts.lisp Changes: ===================================== src/code/extfmts.lisp ===================================== @@ -133,7 +133,8 @@ (setf (gethash (ef-name ef) *external-formats*) ef)) (declaim (inline ef-octets-to-code ef-code-to-octets ef-flush-state ef-copy-state - ef-cache ef-min-octets ef-max-octets)) + ef-cache ef-min-octets ef-max-octets + ef-octet-count)) (defun ef-octets-to-code (ef) (efx-octets-to-code (ef-efx ef))) @@ -176,7 +177,7 @@ ;;; DEFINE-EXTERNAL-FORMAT -- Public ;;; ;;; name (&key base min max size documentation) (&rest slots) octets-to-code -;;; code-to-octets flush-state copy-state +;;; code-to-octets flush-state copy-state octet-count ;;; ;;; Define a new external format. If base is specified, then an ;;; external format is defined that is based on a previously defined @@ -238,6 +239,15 @@ ;;; This should probably be a deep copy so that if the original ;;; state is modified, the copy is not. ;;; +;;; octet-count (code state error &rest vars) +;;; Defines a form to determine the number of octets needed to +;;; encode the given CODE using the external format. This is +;;; essentially the same as CODE-TO-OCTETS, except the encoding is +;;; not saved anywhere. ERROR is the same as in CODE-TO-OCTETS. +;;; +;;; This should return one value: the number of octets needed to +;;; encode the given code. +;;; ;;; Note: external-formats work on code-points, not ;;; characters, so that the entire 31 bit ISO-10646 range can be ;;; used internally regardless of the size of a character recognized View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/865a06b03710020d17e7f9d… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/865a06b03710020d17e7f9d… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-367-count-octets-for-encoding] Include BOM in octet count for UTF-16 and UTF-32
by Raymond Toy (＠rtoy) 12 Jan '25

12 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: 31a76ff7 by Raymond Toy at 2025-01-12T14:08:01-08:00 Include BOM in octet count for UTF-16 and UTF-32 `string-to-octets` includes the BOM when encoding strings. To be consistent, update `string-octet-count` to include the BOM when computing the number of octets. This is only needed for :UTF-16 and :UTF-32 formats. The other utf-16 and utf-32 formats don't include the BOM. Enable tests for these two formats too. - - - - - 3 changed files: - src/pcl/simple-streams/external-formats/utf-16.lisp - src/pcl/simple-streams/external-formats/utf-32.lisp - tests/external-formats.lisp Changes: ===================================== src/pcl/simple-streams/external-formats/utf-16.lisp ===================================== @@ -158,16 +158,16 @@ Unicode replacement character.") ;; The state is list. Copy it `(copy-list ,state)) (octet-count (code state error) - `(progn - #+nil + `(let ((bom-count 0)) (unless ,state ;; Output BOM - (output #xFEFF) + (setf bom-count 2) (setf ,state t)) - (cond ((< ,code #x10000) - 2) - ((< ,code #x110000) - 4) - (t - ;; Replacement character is 2 octets - 2))))) + (+ bom-count + (cond ((< ,code #x10000) + 2) + ((< ,code #x110000) + 4) + (t + ;; Replacement character is 2 octets + 2)))))) ===================================== src/pcl/simple-streams/external-formats/utf-32.lisp ===================================== @@ -116,11 +116,9 @@ Unicode replacement character.") ;; The state is either NIL or T, so we can just return that. `(progn ,state)) (octet-count (code state error) - `(progn - ;; Should we count the BOM? - #+nil + `(let ((bom-count 0)) (unless ,state - (out #xFEFF) + (setf bom-count 4) (setf ,state t)) (cond ((lisp::surrogatep ,code) (if ,error @@ -130,6 +128,6 @@ Unicode replacement character.") (funcall ,error "Surrogate code #x~4,'0X is illegal for UTF32 output" ,code)) ;; Replacement character is 2 octets - 2)) + (+ 2 bom-count))) (t - 4))))) + (+ 4 bom-count)))))) ===================================== tests/external-formats.lisp ===================================== @@ -36,7 +36,6 @@ (:tag :octet-count) (test-octet-count *test-unicode* :utf-8)) -#+nil (define-test octet-count.utf-16 (:tag :octet-count) (test-octet-count *test-unicode* :utf-16)) @@ -49,7 +48,6 @@ (:tag :octet-count) (test-octet-count *test-unicode* :utf-16-le)) -#+nil (define-test octet-count.utf-32 (:tag :octet-count) (test-octet-count *test-unicode* :utf-32)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/31a76ff7e674b0dac9f89d9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/31a76ff7e674b0dac9f89d9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-367-count-octets-for-encoding] Export STRING-OCTET-COUNT
by Raymond Toy (＠rtoy) 12 Jan '25

12 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: aa6f0565 by Raymond Toy at 2025-01-12T13:49:52-08:00 Export STRING-OCTET-COUNT - - - - - 2 changed files: - src/code/exports.lisp - src/code/extfmts.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -1456,7 +1456,8 @@ (name '("STRING-TO-OCTETS" "OCTETS-TO-STRING" "*DEFAULT-EXTERNAL-FORMAT*" "STRING-ENCODE" "STRING-DECODE" "SET-SYSTEM-EXTERNAL-FORMAT" - "LIST-ALL-EXTERNAL-FORMATS" "DESCRIBE-EXTERNAL-FORMAT")) + "LIST-ALL-EXTERNAL-FORMATS" "DESCRIBE-EXTERNAL-FORMAT" + "STRING-OCTET-COUNT")) (intern name "STREAM")) (defpackage "EXTENSIONS" ===================================== src/code/extfmts.lisp ===================================== @@ -19,7 +19,8 @@ string-encode string-decode set-system-external-format +replacement-character-code+ list-all-external-formats - describe-external-format)) + describe-external-format + string-octet-count)) (defvar *default-external-format* :utf-8 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/aa6f05655508dd8f1fae8f8… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/aa6f05655508dd8f1fae8f8… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-367-count-octets-for-encoding] Add tests for octet counts
by Raymond Toy (＠rtoy) 12 Jan '25

12 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: ea8b2abe by Raymond Toy at 2025-01-12T13:46:01-08:00 Add tests for octet counts - - - - - 1 changed file: - + tests/external-formats.lisp Changes: ===================================== tests/external-formats.lisp ===================================== @@ -0,0 +1,68 @@ +;;; Tests for external formats + +(defpackage :external-formats-tests + (:use :cl :lisp-unit)) + +(in-package "EXTERNAL-FORMATS-TESTS") + +(defparameter *test-iso8859-1* + (let ((rs (kernel::make-random-object :state (kernel::init-random-state 27182828)))) + (lisp::codepoints-string + (loop for k from 0 below 1000 + collect (random 256)))) + "Random test string with ISO8859-1 characters") + +(defparameter *test-unicode* + (let ((rs (kernel::make-random-object :state (kernel::init-random-state 27182828)))) + (lisp::codepoints-string + (loop for k from 0 below 1000 + collect (random 20000)))) + "Random test string with codepoints below 20000") + + +(defmacro test-octet-count (string format) + `(assert-equal (length (stream:string-to-octets ,string :external-format ,format)) + (stream::string-octet-count ,string :external-format ,format))) + +(define-test octet-count.iso8859-1 + (:tag :octet-count) + (test-octet-count *test-iso8859-1* :iso8859-1)) + +(define-test octet-count.ascii + (:tag :octet-count) + (test-octet-count *test-iso8859-1* :ascii)) + +(define-test octet-count.utf-8 + (:tag :octet-count) + (test-octet-count *test-unicode* :utf-8)) + +#+nil +(define-test octet-count.utf-16 + (:tag :octet-count) + (test-octet-count *test-unicode* :utf-16)) + +(define-test octet-count.utf-16-be + (:tag :octet-count) + (test-octet-count *test-unicode* :utf-16-be)) + +(define-test octet-count.utf-16-le + (:tag :octet-count) + (test-octet-count *test-unicode* :utf-16-le)) + +#+nil +(define-test octet-count.utf-32 + (:tag :octet-count) + (test-octet-count *test-unicode* :utf-32)) + +(define-test octet-count.utf-32-le + (:tag :octet-count) + (test-octet-count *test-unicode* :utf-32-le)) + +(define-test octet-count.utf-32-le + (:tag :octet-count) + (test-octet-count *test-unicode* :utf-32-le)) + + + + + View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ea8b2abee2ded208d69fdae… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ea8b2abee2ded208d69fdae… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-367-count-octets-for-encoding] 2 commits: Fix typos in octet-count in utf-16 and utf-32
by Raymond Toy (＠rtoy) 12 Jan '25

12 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: f0298943 by Raymond Toy at 2025-01-12T13:09:13-08:00 Fix typos in octet-count in utf-16 and utf-32 Too much cutting and pasting so that we incorrectly named `octet-count` as `code-to-octets`. Fix the names. - - - - - 171e34ac by Raymond Toy at 2025-01-12T13:25:08-08:00 Fix typo in utf-32-be: Remove extra closing paren - - - - - 6 changed files: - src/pcl/simple-streams/external-formats/utf-16-be.lisp - src/pcl/simple-streams/external-formats/utf-16-le.lisp - src/pcl/simple-streams/external-formats/utf-16.lisp - src/pcl/simple-streams/external-formats/utf-32-be.lisp - src/pcl/simple-streams/external-formats/utf-32-le.lisp - src/pcl/simple-streams/external-formats/utf-32.lisp Changes: ===================================== src/pcl/simple-streams/external-formats/utf-16-be.lisp ===================================== @@ -111,7 +111,7 @@ Unicode replacement character.") ;; The state is either NIL or a codepoint, so nothing really ;; special is needed to copy it. `(progn ,state)) - (code-to-octets (code state error) + (octet-count (code state error) `(cond ((< ,code #x10000) 2) ((< ,code #x110000) ===================================== src/pcl/simple-streams/external-formats/utf-16-le.lisp ===================================== @@ -112,7 +112,7 @@ Unicode replacement character.") ;; The state is either NIL or a codepoint, so nothing really ;; special is needed. `(progn ,state)) - (code-to-octets (code state error) + (octet-count (code state error) `(cond ((< ,code #x10000) 2) ((< ,code #x110000) ===================================== src/pcl/simple-streams/external-formats/utf-16.lisp ===================================== @@ -157,7 +157,7 @@ Unicode replacement character.") (copy-state (state) ;; The state is list. Copy it `(copy-list ,state)) - (code-to-octets (code state error) + (octet-count (code state error) `(progn #+nil (unless ,state ===================================== src/pcl/simple-streams/external-formats/utf-32-be.lisp ===================================== @@ -64,7 +64,7 @@ Unicode replacement character.") (out ,code))))) () () - (code-to-octets (code state error) + (octet-count (code state error) `(cond ((lisp::surrogatep ,code) (if ,error (locally @@ -75,4 +75,4 @@ Unicode replacement character.") ;; Replacement character is 2 octets 2)) (t - 4))))) + 4)))) ===================================== src/pcl/simple-streams/external-formats/utf-32-le.lisp ===================================== @@ -65,7 +65,7 @@ Unicode replacement character.") (out ,code))))) () () - (code-to-octets (code state error) + (octet-count (code state error) `(cond ((lisp::surrogatep ,code) (if ,error (locally ===================================== src/pcl/simple-streams/external-formats/utf-32.lisp ===================================== @@ -115,7 +115,7 @@ Unicode replacement character.") (copy-state (state) ;; The state is either NIL or T, so we can just return that. `(progn ,state)) - (code-to-octets (code state output error i c) + (octet-count (code state error) `(progn ;; Should we count the BOM? #+nil View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/83db856a43a3e810cfdce0… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/83db856a43a3e810cfdce0… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-367-count-octets-for-encoding] 2 commits: Copy the utf-8, iso8859-1, ascii impl
by Raymond Toy (＠rtoy) 12 Jan '25

12 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: f5b4ae8a by Raymond Toy at 2025-01-12T11:39:37-08:00 Copy the utf-8, iso8859-1, ascii impl These external formats are defined in extfmts. For completeness, copy these implementations to the corresponding files in src/pcl/simple-streams/external-formats. - - - - - 83db856a by Raymond Toy at 2025-01-12T11:49:48-08:00 Implement octet-count utf-16 and utf-32. Pretty basic implementation, taking care of handling the replacement character if needed. - - - - - 9 changed files: - src/pcl/simple-streams/external-formats/ascii.lisp - src/pcl/simple-streams/external-formats/iso8859-1.lisp - src/pcl/simple-streams/external-formats/utf-16-be.lisp - src/pcl/simple-streams/external-formats/utf-16-le.lisp - src/pcl/simple-streams/external-formats/utf-16.lisp - src/pcl/simple-streams/external-formats/utf-32-be.lisp - src/pcl/simple-streams/external-formats/utf-32-le.lisp - src/pcl/simple-streams/external-formats/utf-32.lisp - src/pcl/simple-streams/external-formats/utf-8.lisp Changes: ===================================== src/pcl/simple-streams/external-formats/ascii.lisp ===================================== @@ -33,5 +33,15 @@ replaced with a question mark.") (declare (optimize (ext:inhibit-warnings 3))) (funcall ,error "Cannot output codepoint #x~X to ASCII stream" ,code)) #x3F) - ,code)))) + ,code))) + () + () + (octet-count (code state error) + `(if (> ,code #x7f) + (if ,error + (locally + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error "Cannot output codepoint #x~X to ASCII stream" ,code)) + 1) + 1))) ===================================== src/pcl/simple-streams/external-formats/iso8859-1.lisp ===================================== @@ -31,4 +31,17 @@ character and illegal outputs are replaced by a question mark.") (funcall ,error "Cannot output codepoint #x~X to ISO8859-1 stream" ,code 1)) #x3F) - ,code)))) + ,code))) + () + () + (octet-count (code state error) + `(if (> ,code 255) + (if ,error + (locally + ;; No warnings about fdefinition + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error + (intl:gettext "Cannot output codepoint #x~X to ISO8859-1 stream") + ,code 1)) + 1) + 1))) ===================================== src/pcl/simple-streams/external-formats/utf-16-be.lisp ===================================== @@ -110,4 +110,12 @@ Unicode replacement character.") (copy-state (state) ;; The state is either NIL or a codepoint, so nothing really ;; special is needed to copy it. - `(progn ,state))) + `(progn ,state)) + (code-to-octets (code state error) + `(cond ((< ,code #x10000) + 2) + ((< ,code #x110000) + 4) + (t + ;; Replacement character is 2 octets + 2)))) ===================================== src/pcl/simple-streams/external-formats/utf-16-le.lisp ===================================== @@ -111,4 +111,12 @@ Unicode replacement character.") (copy-state (state) ;; The state is either NIL or a codepoint, so nothing really ;; special is needed. - `(progn ,state))) + `(progn ,state)) + (code-to-octets (code state error) + `(cond ((< ,code #x10000) + 2) + ((< ,code #x110000) + 4) + (t + ;; Replacement character is 2 octets + 2)))) ===================================== src/pcl/simple-streams/external-formats/utf-16.lisp ===================================== @@ -156,4 +156,18 @@ Unicode replacement character.") ,c)))))) (copy-state (state) ;; The state is list. Copy it - `(copy-list ,state))) + `(copy-list ,state)) + (code-to-octets (code state error) + `(progn + #+nil + (unless ,state + ;; Output BOM + (output #xFEFF) + (setf ,state t)) + (cond ((< ,code #x10000) + 2) + ((< ,code #x110000) + 4) + (t + ;; Replacement character is 2 octets + 2))))) ===================================== src/pcl/simple-streams/external-formats/utf-32-be.lisp ===================================== @@ -61,4 +61,18 @@ Unicode replacement character.") ,code)) +replacement-character-code+))) (t - (out ,code)))))) + (out ,code))))) + () + () + (code-to-octets (code state error) + `(cond ((lisp::surrogatep ,code) + (if ,error + (locally + ;; No warnings about fdefinition + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error "Surrogate code #x~4,'0X is illegal for UTF32 output" + ,code)) + ;; Replacement character is 2 octets + 2)) + (t + 4))))) ===================================== src/pcl/simple-streams/external-formats/utf-32-le.lisp ===================================== @@ -62,4 +62,18 @@ Unicode replacement character.") ,code)) +replacement-character-code+))) (t - (out ,code)))))) + (out ,code))))) + () + () + (code-to-octets (code state error) + `(cond ((lisp::surrogatep ,code) + (if ,error + (locally + ;; No warnings about fdefinition + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error "Surrogate code #x~4,'0X is illegal for UTF32 output" + ,code)) + ;; Replacement character is 2 octets + 2)) + (t + 4)))) ===================================== src/pcl/simple-streams/external-formats/utf-32.lisp ===================================== @@ -114,4 +114,22 @@ Unicode replacement character.") nil (copy-state (state) ;; The state is either NIL or T, so we can just return that. - `(progn ,state))) + `(progn ,state)) + (code-to-octets (code state output error i c) + `(progn + ;; Should we count the BOM? + #+nil + (unless ,state + (out #xFEFF) + (setf ,state t)) + (cond ((lisp::surrogatep ,code) + (if ,error + (locally + ;; No warnings about fdefinition + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error "Surrogate code #x~4,'0X is illegal for UTF32 output" + ,code)) + ;; Replacement character is 2 octets + 2)) + (t + 4))))) ===================================== src/pcl/simple-streams/external-formats/utf-8.lisp ===================================== @@ -127,4 +127,14 @@ replacement character.") ((< ,code #x800) (utf8 ,code 1)) ((< ,code #x10000) (utf8 ,code 2)) ((< ,code #x110000) (utf8 ,code 3)) - (t (error "How did this happen? Codepoint U+~X is illegal" ,code)))))) + (t (error "How did this happen? Codepoint U+~X is illegal" ,code))))) + () + () + (octet-count (code state error) + `(locally + (declare (optimize (ext:inhibit-warnings 3))) + (cond ((< ,code #x80) 1) + ((< ,code #x800) 2) + ((< ,code #x10000) 3) + ((< ,code #x110000) 4) + (t (error "How did this happen? Codepoint U+~X is illegal" ,code)))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/582a9f51db3e6df7b653df… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/582a9f51db3e6df7b653df… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-367-count-octets-for-encoding] Fix value of bootstrap var
by Raymond Toy (＠rtoy) 12 Jan '25

12 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: 582a9f51 by Raymond Toy at 2025-01-11T19:32:54-08:00 Fix value of bootstrap var Forgot to include the "-B" to tell the build.sh what the bootstrap file is. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,7 +1,7 @@ variables: download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/2024/08" version: "2024-08-x86" - bootstrap: "boot-2024-08" + bootstrap: "-B boot-2024-08" stages: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/582a9f51db3e6df7b653df9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/582a9f51db3e6df7b653df9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-367-count-octets-for-encoding
by Raymond Toy (＠rtoy) 12 Jan '25

12 Jan '25

Raymond Toy pushed new branch issue-367-count-octets-for-encoding at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-367-count-octets-fo… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-363-add-version-number] 3 commits: Clean up changes
by Raymond Toy (＠rtoy) 10 Jan '25

10 Jan '25

Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl Commits: 2dcd20b0 by Raymond Toy at 2025-01-09T20:11:18-08:00 Clean up changes Comment out `set -x` things that we don't need but could be useful in the future for debugging. For the make file, remove some unneeded echoes in the rule. - - - - - a8014384 by Raymond Toy at 2025-01-09T20:17:29-08:00 Always rebuild lisp.o to keep version number in sync We need to recompile lisp.o whenever make is run so that we get an updated cmucl version to match what build.sh and friends are using. To do this add lisp.o to the .PHONY target. - - - - - c60a9a25 by Raymond Toy at 2025-01-09T20:18:41-08:00 Don't need to `cd src` before calling git describe As long as we call this somewhere in the git repo, we'll be able to get something. - - - - - 5 changed files: - bin/build.sh - bin/cmucl-version.sh - bin/make-dist.sh - bin/run-unit-tests.sh - src/lisp/GNUmakefile Changes: ===================================== bin/build.sh ===================================== @@ -131,9 +131,9 @@ buildit () if [ "$ENABLE" = "yes" ]; then $TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; } - set -x + #set -x time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } - set +x + #set +x if [ "$REBUILD_LISP" = "yes" ]; then $TOOLDIR/rebuild-lisp.sh $TARGET fi @@ -144,15 +144,15 @@ buildit () if [ "$BUILD_WORLD2" = "yes" ]; then - set -x + #set -x $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } - set +x + #set +x fi $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; } - set -x + #set -x $TARGET/lisp/lisp -lib $TARGET/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; } - set +x + #set +x return 0; fi } ===================================== bin/cmucl-version.sh ===================================== @@ -1,7 +1,7 @@ #!/bin/sh # Script to determine the cmucl version based on git describe -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null || git describe 2>/dev/null)`" +GIT_HASH="`(git describe --dirty 2>/dev/null || git describe 2>/dev/null)`" # echo GIT_HASH = ${GIT_HASH} if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then ===================================== bin/make-dist.sh ===================================== @@ -149,7 +149,7 @@ if [ -n "$COMPRESS_ARG" ]; then esac fi -set -x +#set -x if [ -z "$VERSION" ]; then # If a default version exists, use it. Otherwise this is an # error---at least one of these must not be empty. ===================================== bin/run-unit-tests.sh ===================================== @@ -49,7 +49,7 @@ function cleanup { trap cleanup EXIT -set -x +#set -x if [ -n "${TESTDIR}" ]; then TESTDIRARG=" :test-directory \"${TESTDIR}/\"" else ===================================== src/lisp/GNUmakefile ===================================== @@ -54,8 +54,6 @@ version.o : version.c version $(CC) ${CFLAGS} $(CPPFLAGS) -DVERSION=`cat version` -c $< lisp.o : lisp.c - echo GIT_HASH = ${GIT_HASH} - echo DEFAULT_VERSION = ${DEFAULT_VERSION} $(CC) ${CFLAGS} $(CPPFLAGS) -DCMUCL_VERSION="\"${DEFAULT_VERSION}\"" -c $< lisp: ${OBJS} version.o @@ -127,7 +125,8 @@ translations: rm -f /tmp/$$$$-updated-$$f.po /tmp/$$$$-orig-$$f.po; \ done; done -.PHONY : translations +# Always build lisp.o so that the embedded version is updated. +.PHONY : translations lisp.o # Like translations, but we don't compute the diff. We just overwrite # the po files in the repository so that we can tell if the View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/c16456c663e3fe6ac02831… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/c16456c663e3fe6ac02831… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-369-unix-setlocale-docstring] Update docstring some more and the pot file
by Raymond Toy (＠rtoy) 09 Jan '25

09 Jan '25

Raymond Toy pushed to branch issue-369-unix-setlocale-docstring at cmucl / cmucl Commits: 4191faa0 by Raymond Toy at 2025-01-08T19:59:09-08:00 Update docstring some more and the pot file Forgot to mention the return values which were in the original docstring. Update the pot file for the changed docstring. - - - - - 2 changed files: - src/code/unix.lisp - src/i18n/locale/cmucl-unix.pot Changes: ===================================== src/code/unix.lisp ===================================== @@ -2874,7 +2874,9 @@ (defun unix-setlocale () _N"Set all the categories of the locale from the values of the - environment variables using setlocale(LC_ALL, \"\")" + environment variables using setlocale(LC_ALL, \"\"). + + Returns 0 on success and -1 if setlocale failed." (alien:alien-funcall (alien:extern-alien "os_setlocale" (function c-call:int)))) ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -1418,7 +1418,11 @@ msgid "" msgstr "" #: src/code/unix.lisp -msgid "Call setlocale(3c) with fixed args. Returns 0 on success." +msgid "" +"Set all the categories of the locale from the values of the\n" +" environment variables using setlocale(LC_ALL, \"\").\n" +"\n" +" Returns 0 on success and -1 if setlocale failed." msgstr "" #: src/code/unix.lisp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/4191faa08c887322f8fe0b1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/4191faa08c887322f8fe0b1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0