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

[Git][cmucl/cmucl][issue-240-set-diff-with-hash-table] Break up functions into smaller pieces
by Raymond Toy (＠rtoy) 22 Jun '23

22 Jun '23

Raymond Toy pushed to branch issue-240-set-diff-with-hash-table at cmucl / cmucl Commits: 7e598eb2 by Raymond Toy at 2023-06-22T16:07:33-07:00 Break up functions into smaller pieces Split out the key parts of list-to-hasthable and set-difference to make it easier to profile the cost of doing the individual items, like making the hashtables from list1 and list2 and computing the set difference using the two different hashtables. - - - - - 1 changed file: - src/code/list.lisp Changes: ===================================== src/code/list.lisp ===================================== @@ -748,6 +748,18 @@ (defparameter *min-list-length-for-hashtable* 15) +(defun init-hashtable-list1 (list1 len &key key test) + (let ((hashtable (make-hash-table :test test :size len))) + (dolist (item list1) + (push item (gethash (apply-key key item) hashtable))) + (values hashtable list1))) + +(defun init-hashtable-list2 (list2 len &key key test) + (let ((hashtable (make-hash-table :test test :size len))) + (dolist (item list2) + (setf (gethash (apply-key key item) hashtable) item)) + (values hashtable list2))) + ;; Convert a list to a hashtable. Given 2 lists, find the shorter of ;; the two lists and add the shorter list to a hashtable. Returns the ;; hashtable and the shorter list. @@ -771,24 +783,28 @@ (do ((length 0 (1+ length)) (l1 list1 (cdr l1)) (l2 list2 (cdr l2))) - ((cond ((null l2) + ((cond ((endp l2) (return (values length list2))) - ((null l1) + ((endp l1) (return (values length list1)))))) ;; If the list is too short, the hashtable makes things ;; slower. We also need to balance memory usage. (when (< len *min-list-length-for-hashtable*) (return-from list-to-hashtable (values nil nil))) (cond ((eq shorter-list list2) + #+nil (let ((hashtable (make-hash-table :test test :size len))) (dolist (item list2) (setf (gethash (apply-key key item) hashtable) item)) - (values hashtable list2))) + (values hashtable list2)) + (init-hashtable-list2 list2 len :key key :test test)) ((eq shorter-list list1) + #+nil (let ((hashtable (make-hash-table :test test :size len))) (dolist (item list1) (push item (gethash (apply-key key item) hashtable))) - (values hashtable list1)))))))) + (values hashtable list1)) + (init-hashtable-list1 list1 len :key key :test test))))))) ;;; UNION -- Public. ;;; @@ -857,6 +873,24 @@ (setq list1 (Cdr list1)))) res)) +(defun set-diff-hash2 (list1 hashtable &key key) + (let (diff) + (dolist (item list1) + (unless (nth-value 1 (gethash (apply-key key item) hashtable)) + (push item diff))) + diff)) + +(defun set-diff-hash1 (list2 hashtable &key key) + (dolist (item list2) + (unless (eq hashtable (gethash (apply-key key item) hashtable hashtable)) + (remhash item hashtable))) + (let ((result '())) + (maphash #'(lambda (key value) + (declare (ignore key)) + (setq result (nconc result value))) + hashtable) + result)) + (defun set-difference (list1 list2 &key key (test #'eql testp) (test-not nil notp)) "Returns the elements of list1 which are not in list2." (declare (inline member)) @@ -878,22 +912,27 @@ res)) ((eq shorter-list list2) ;; list2 was placed in hash table. + #+nil (let (diff) (dolist (item list1) (unless (nth-value 1 (gethash (apply-key key item) hashtable)) (push item diff))) - diff)) + diff) + (set-diff-hash2 list1 hashtable :key key)) ((eq shorter-list list1) ;; list1 was placed in the hash table. + #+nil (dolist (item list2) (unless (eq hashtable (gethash (apply-key key item) hashtable hashtable)) (remhash item hashtable))) + #+nil (let ((result '())) (maphash #'(lambda (key value) (declare (ignore key)) (setq result (nconc result value))) hashtable) - result))))) + result) + (set-diff-hash1 list2 hashtable :key key))))) (defun nset-difference (list1 list2 &key key View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7e598eb28797a2310bab7dd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7e598eb28797a2310bab7dd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-240-set-diff-with-hash-table] Add some simple set-difference tests with hashtables.
by Raymond Toy (＠rtoy) 20 Jun '23

20 Jun '23

Raymond Toy pushed to branch issue-240-set-diff-with-hash-table at cmucl / cmucl Commits: 28aafe04 by Raymond Toy at 2023-06-19T18:12:15-07:00 Add some simple set-difference tests with hashtables. - - - - - 1 changed file: - + tests/sets.lisp Changes: ===================================== tests/sets.lisp ===================================== @@ -0,0 +1,74 @@ +;; Tests for sets + +(defpackage :sets-tests + (:use :cl :lisp-unit)) + +(in-package "SETS-TESTS") + +(define-test set-diff.hash-eql + (:tag :issues) + ;; For set-difference to use hashtables by making the threshold + ;; small. + (let ((lisp::*min-list-length-for-hashtable* 2)) + (assert-equal '(2 2 1) + (set-difference '(1 2 2 3) '(3 4))) + (assert-equal '(1 2 2) + (set-difference '(1 2 2 3) '(3 4 5 6 7 8))) + (assert-equal '(2 2 1) + (set-difference '(1 2 2 3) '(3 4) + :test #'eql)) + (assert-equal '(1 2 2) + (set-difference '(1 2 2 3) '(3 4 5 6 7 8) + :test #'eql)))) + +(define-test set-diff.hash-eq + (:tag :issues) + (let ((lisp::*min-list-length-for-hashtable* 2)) + (assert-equal '(b b a) + (set-difference '(a b b c) '(c d e) :test 'eq)) + (assert-equal '(a b b) + (set-difference '(a b b c) '(c d e f g h) :test 'eq)) + (assert-equal '(b b a) + (set-difference '(a b b c) '(c d e) :test #'eq)) + (assert-equal '(a b b) + (set-difference '(a b b c) '(c d e f g h) :test #'eq)))) + +(define-test set-diff.hash-equal + (:tag :issues) + (let ((lisp::*min-list-length-for-hashtable* 2)) + (assert-equal '("b" "b" "a") + (set-difference '("a" "b" "b" "c") + '("c" "d" "e") + :test 'equal)) + (assert-equal '("a" "b" "b") + (set-difference '("a" "b" "b" "c") + '("c" "d" "e" "f" "g" "h") + :test 'equal)) + (assert-equal '("b" "b" "a") + (set-difference '("a" "b" "b" "c") + '("c" "d" "e") + :test #'equal)) + (assert-equal '("a" "b" "b") + (set-difference '("a" "b" "b" "c") + '("c" "d" "e" "f" "g" "h") + :test #'equal)))) + +(define-test set-diff.hash-equalp + (:tag :issues) + (let ((lisp::*min-list-length-for-hashtable* 2)) + (assert-equal '("b" "b" "a") + (set-difference '("a" "b" "b" "c") + '("C" "d" "e") + :test 'equalp)) + (assert-equal '("a" "b" "b") + (set-difference '("a" "b" "b" "C") + '("c" "D" "e" "f" "g" "h") + :test 'equalp)) + (assert-equal '("b" "b" "a") + (set-difference '("a" "b" "b" "c") + '("C" "d" "e") + :test #'equalp)) + (assert-equal '("a" "b" "b") + (set-difference '("a" "b" "b" "C") + '("c" "D" "e" "f" "g" "h") + :test #'equalp)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/28aafe047bc4bf7ee9485c9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/28aafe047bc4bf7ee9485c9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-240-set-diff-with-hash-table] Fix typo in set-difference
by Raymond Toy (＠rtoy) 19 Jun '23

19 Jun '23

Raymond Toy pushed to branch issue-240-set-diff-with-hash-table at cmucl / cmucl Commits: bc7826a7 by Raymond Toy at 2023-06-19T14:26:19-07:00 Fix typo in set-difference The early exist for when list2 is empty had a typo with `list` instead of `list2`. - - - - - 1 changed file: - src/code/list.lisp Changes: ===================================== src/code/list.lisp ===================================== @@ -863,7 +863,7 @@ (if (and testp notp) (error "Test and test-not both supplied.")) ;; Quick exit - (when (null list) + (when (null list2) (return-from set-difference list1)) (multiple-value-bind (hashtable shorter-list) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/bc7826a734123f627eccc4f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/bc7826a734123f627eccc4f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-240-set-diff-with-hash-table] 2 commits: Prefer list2 when both lists have the same length
by Raymond Toy (＠rtoy) 19 Jun '23

19 Jun '23

Raymond Toy pushed to branch issue-240-set-diff-with-hash-table at cmucl / cmucl Commits: ac30347e by Raymond Toy at 2023-06-19T13:45:44-07:00 Prefer list2 when both lists have the same length Also add some comments. - - - - - 57f0451c by Raymond Toy at 2023-06-19T13:48:29-07:00 Allow quick exit in set-difference Also, now that set-difference is pretty large, don't declare it as maybe-inline. - - - - - 1 changed file: - src/code/list.lisp Changes: ===================================== src/code/list.lisp ===================================== @@ -45,7 +45,7 @@ tree-equal list-length nth %setnth nthcdr last make-list append copy-list copy-alist copy-tree revappend nconc nreconc butlast nbutlast ldiff member member-if member-if-not tailp adjoin union - nunion intersection nintersection set-difference nset-difference + nunion intersection nintersection nset-difference set-exclusive-or nset-exclusive-or subsetp acons pairlis assoc assoc-if assoc-if-not rassoc rassoc-if rassoc-if-not subst subst-if subst-if-not nsubst nsubst-if nsubst-if-not sublis nsublis)) @@ -744,11 +744,13 @@ list (cons item list))) +;; The minimum length of a list before we can use a hashtable (defparameter *min-list-length-for-hashtable* 15) ;; Convert a list to a hashtable. Given 2 lists, find the shorter of -;; the two lists and add the shorter list to a hashtable. +;; the two lists and add the shorter list to a hashtable. Returns the +;; hashtable and the shorter list. (defun list-to-hashtable (list1 list2 &key test test-not key) ;; Don't currently support test-not when converting a list to a hashtable (unless test-not @@ -763,13 +765,18 @@ (unless hash-test (return-from list-to-hashtable (values nil nil))) (multiple-value-bind (len shorter-list) + ;; Find the list with the shorter length. If they're they + ;; same, we prefer the second list to the first list since + ;; the hashtable implementation is slightly simplier. (do ((length 0 (1+ length)) (l1 list1 (cdr l1)) (l2 list2 (cdr l2))) - ((cond ((null l1) - (return (values length list1))) - ((null l2) - (return (values length list2)))))) + ((cond ((null l2) + (return (values length list2))) + ((null l1) + (return (values length list1)))))) + ;; If the list is too short, the hashtable makes things + ;; slower. We also need to balance memory usage. (when (< len *min-list-length-for-hashtable*) (return-from list-to-hashtable (values nil nil))) (cond ((eq shorter-list list2) @@ -855,18 +862,20 @@ (declare (inline member)) (if (and testp notp) (error "Test and test-not both supplied.")) + ;; Quick exit + (when (null list) + (return-from set-difference list1)) + (multiple-value-bind (hashtable shorter-list) (list-to-hashtable list1 list2 :key key :test test :test-not test-not) (cond ((null hashtable) ;; Default implementation because we didn't create the hash ;; table. - (if (null list2) - list1 - (let ((res nil)) - (dolist (elt list1) - (if (not (with-set-keys (member (apply-key key elt) list2))) - (push elt res))) - res))) + (let ((res nil)) + (dolist (elt list1) + (if (not (with-set-keys (member (apply-key key elt) list2))) + (push elt res))) + res)) ((eq shorter-list list2) ;; list2 was placed in hash table. (let (diff) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/653dc42ff6285a475709fe… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/653dc42ff6285a475709fe… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-240-set-diff-with-hash-table] Forgot to return the value
by Raymond Toy (＠rtoy) 19 Jun '23

19 Jun '23

Raymond Toy pushed to branch issue-240-set-diff-with-hash-table at cmucl / cmucl Commits: 653dc42f by Raymond Toy at 2023-06-19T13:19:51-07:00 Forgot to return the value When list1 was in the hashtable, we forgot to return values from the hashtable after computing the return value. - - - - - 1 changed file: - src/code/list.lisp Changes: ===================================== src/code/list.lisp ===================================== @@ -883,7 +883,8 @@ (maphash #'(lambda (key value) (declare (ignore key)) (setq result (nconc result value))) - hashtable)))))) + hashtable) + result))))) (defun nset-difference (list1 list2 &key key View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/653dc42ff6285a475709fe2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/653dc42ff6285a475709fe2… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-240-set-diff-with-hash-table] 4 commits: Fix #154 - add 'en_US.UTF-8@piglatin' as locale-alias for 'en@piglatin'
by Raymond Toy (＠rtoy) 19 Jun '23

19 Jun '23

Raymond Toy pushed to branch issue-240-set-diff-with-hash-table at cmucl / cmucl Commits: b1592289 by Jon Boone at 2023-06-19T00:07:56+00:00 Fix #154 - add 'en_US.UTF-8@piglatin' as locale-alias for 'en@piglatin' - - - - - 361c463b by Jon Boone at 2023-06-19T00:08:11+00:00 Merge branch 'issue-154-piglatin-translation-doesnt-work-anymore' into 'master' Fix #154 - add 'en_US.UTF-8@piglatin' as locale-alias for 'en@piglatin' Closes #154 and #216 See merge request cmucl/cmucl!151 - - - - - d8502e05 by Raymond Toy at 2023-06-19T07:19:00-07:00 Add release notes for 21f Just pulled in the template and added that #154 has been fixed. - - - - - edac2a0f by Raymond Toy at 2023-06-19T12:50:10-07:00 Merge branch 'master' into issue-240-set-diff-with-hash-table - - - - - 6 changed files: - .gitlab-ci.yml - bin/build.sh - src/code/intl.lisp - + src/general-info/release-21f.md - src/i18n/locale/cmucl.pot - tests/issues.lisp Changes: ===================================== .gitlab-ci.yml ===================================== @@ -46,6 +46,7 @@ linux:build: #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp # Regular build using the cross-compiled result or snapshot - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp + # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 linux:test: ===================================== bin/build.sh ===================================== @@ -130,13 +130,11 @@ buildit () time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } if [ "$REBUILD_LISP" = "yes" ]; then $TOOLDIR/rebuild-lisp.sh $TARGET - else - # Set the LANG to C. For whatever reason, if I (rtoy) don't - # do this on my openSuSE system, any messages from gcc are - # basically garbled. This should be harmless on other - # systems. - LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } - fi + fi + + # Set the LANG to C. For whatever reason, if I (rtoy) don't do this on my openSuSE system, + # any messages from gcc are basically garbled. This should be harmless on other systems. + LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } if [ "$BUILD_WORLD2" = "yes" ]; then ===================================== src/code/intl.lisp ===================================== @@ -51,6 +51,7 @@ Use (INTL:TEXTDOMAIN \"whatever\") in each source file to set this.") (defvar *loaded-domains* (make-hash-table :test 'equal)) (defvar *locale-aliases* (make-hash-table :test 'equal)) +(setf (gethash "en_US.UTF-8@piglatin" *locale-aliases*) "en@piglatin") (defstruct domain-entry (domain "" :type simple-base-string) ===================================== src/general-info/release-21f.md ===================================== @@ -0,0 +1,40 @@ +# Work in progress + +The CMUCL project is pleased to announce the release of CMUCL 21f. +This is a major release which contains numerous enhancements and bug +fixes from the <previous> release. + +CMUCL is a free, high performance implementation of the Common Lisp +programming language which runs on most major Unix platforms. It +mainly conforms to the ANSI Common Lisp standard. CMUCL provides a +sophisticated native code compiler; a powerful foreign function +interface; an implementation of CLOS, the Common Lisp Object System, +which includes multi-methods and a meta-object protocol; a +source-level debugger and code profiler; and an Emacs-like editor +implemented in Common Lisp. CMUCL is maintained by a team of +volunteers collaborating over the Internet, and is mostly in the +public domain. + +## New in this release: + * Known issues: + * Feature enhancements: + * Changes: + * ANSI compliance fixes: + * Bug fixes: + * Gitlab tickets: + * ~~#154~~ piglatin translation does not work anymore + * Other changes: + * Improvements to the PCL implementation of CLOS: + * Changes to building procedure: + +This release is not binary compatible with code compiled using CMUCL +21e; you will need to recompile FASL files. + +See http://www.cmucl.org or +https://gitlab.common-lisp.net/cmucl/cmucl for more information, +See +https://gitlab.common-lisp.net/cmucl/cmucl/wikis/GettingCmucl +for obtaining CMUCL, including sources and binaries.. + + +We hope you enjoy using this release of CMUCL! ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -9083,7 +9083,8 @@ msgstr "" #: src/code/extfmts.lisp msgid "" "The default external format to use if no other external format is\n" -" specified" +" specified. This is unaffected by any locale settings or by\n" +" SET-SYSTEM-EXTERNAL-FORMAT." msgstr "" #: src/code/extfmts.lisp ===================================== tests/issues.lisp ===================================== @@ -830,7 +830,18 @@ (assert-true (stream::find-external-format :euckr)) (assert-true (stream::find-external-format :cp949)))) - +(define-test issue.154 + (:tag :issues) + (let ((old-locale intl::*locale*) + (locale "en_US.UTF-8@piglatin") + (piglatin-text "Ethay izesay ofway away eamstray inway-ufferbay.")) + (unwind-protect + (progn + (assert-equal locale (intl:setlocale "en_US.UTF-8@piglatin")) + (print (intl::find-domain "cmucl" intl::*locale*)) + (assert-equal piglatin-text (intl:dgettext "cmucl" "The size of a stream in-buffer.")) + ) + (intl:setlocale old-locale)))) (define-test issue.158 (:tag :issues) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/f9485d0873657a8e833363… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/f9485d0873657a8e833363… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-240-set-diff-with-hash-table] Handle the case of NIL in list2.
by Raymond Toy (＠rtoy) 19 Jun '23

19 Jun '23

Raymond Toy pushed to branch issue-240-set-diff-with-hash-table at cmucl / cmucl Commits: f9485d08 by Raymond Toy at 2023-06-19T12:46:39-07:00 Handle the case of NIL in list2. When list2 is in the hash table and it contains NIL and list1 also contains NIL, we were erroneously including NIL in the difference. This was because we weren't checking the second return value for gethash. Also, for consistency, don't reverse the set of differences. This makes output from the hash-table version match the list version. Finally, add a defparameter to specify the length threshold for converting a list to hashtable. This is mostly for testing to determine an appropriate value. - - - - - 1 changed file: - src/code/list.lisp Changes: ===================================== src/code/list.lisp ===================================== @@ -744,6 +744,8 @@ list (cons item list))) +(defparameter *min-list-length-for-hashtable* + 15) ;; Convert a list to a hashtable. Given 2 lists, find the shorter of ;; the two lists and add the shorter list to a hashtable. @@ -768,7 +770,7 @@ (return (values length list1))) ((null l2) (return (values length list2)))))) - (when (< len 15) + (when (< len *min-list-length-for-hashtable*) (return-from list-to-hashtable (values nil nil))) (cond ((eq shorter-list list2) (let ((hashtable (make-hash-table :test test :size len))) @@ -869,9 +871,9 @@ ;; list2 was placed in hash table. (let (diff) (dolist (item list1) - (unless (gethash (apply-key key item) hashtable) + (unless (nth-value 1 (gethash (apply-key key item) hashtable)) (push item diff))) - (nreverse diff))) + diff)) ((eq shorter-list list1) ;; list1 was placed in the hash table. (dolist (item list2) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f9485d0873657a8e8333634… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f9485d0873657a8e8333634… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Add release notes for 21f
by Raymond Toy (＠rtoy) 19 Jun '23

19 Jun '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: d8502e05 by Raymond Toy at 2023-06-19T07:19:00-07:00 Add release notes for 21f Just pulled in the template and added that #154 has been fixed. - - - - - 1 changed file: - + src/general-info/release-21f.md Changes: ===================================== src/general-info/release-21f.md ===================================== @@ -0,0 +1,40 @@ +# Work in progress + +The CMUCL project is pleased to announce the release of CMUCL 21f. +This is a major release which contains numerous enhancements and bug +fixes from the <previous> release. + +CMUCL is a free, high performance implementation of the Common Lisp +programming language which runs on most major Unix platforms. It +mainly conforms to the ANSI Common Lisp standard. CMUCL provides a +sophisticated native code compiler; a powerful foreign function +interface; an implementation of CLOS, the Common Lisp Object System, +which includes multi-methods and a meta-object protocol; a +source-level debugger and code profiler; and an Emacs-like editor +implemented in Common Lisp. CMUCL is maintained by a team of +volunteers collaborating over the Internet, and is mostly in the +public domain. + +## New in this release: + * Known issues: + * Feature enhancements: + * Changes: + * ANSI compliance fixes: + * Bug fixes: + * Gitlab tickets: + * ~~#154~~ piglatin translation does not work anymore + * Other changes: + * Improvements to the PCL implementation of CLOS: + * Changes to building procedure: + +This release is not binary compatible with code compiled using CMUCL +21e; you will need to recompile FASL files. + +See http://www.cmucl.org or +https://gitlab.common-lisp.net/cmucl/cmucl for more information, +See +https://gitlab.common-lisp.net/cmucl/cmucl/wikis/GettingCmucl +for obtaining CMUCL, including sources and binaries.. + + +We hope you enjoy using this release of CMUCL! View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d8502e05d03790b81b5d982… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d8502e05d03790b81b5d982… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #154 - add 'en_US.UTF-8@piglatin' as locale-alias for 'en@piglatin'
by Jon Boone (＠jboone) 19 Jun '23

19 Jun '23

Jon Boone pushed to branch master at cmucl / cmucl Commits: b1592289 by Jon Boone at 2023-06-19T00:07:56+00:00 Fix #154 - add 'en_US.UTF-8@piglatin' as locale-alias for 'en@piglatin' - - - - - 361c463b by Jon Boone at 2023-06-19T00:08:11+00:00 Merge branch 'issue-154-piglatin-translation-doesnt-work-anymore' into 'master' Fix #154 - add 'en_US.UTF-8@piglatin' as locale-alias for 'en@piglatin' Closes #154 and #216 See merge request cmucl/cmucl!151 - - - - - 5 changed files: - .gitlab-ci.yml - bin/build.sh - src/code/intl.lisp - src/i18n/locale/cmucl.pot - tests/issues.lisp Changes: ===================================== .gitlab-ci.yml ===================================== @@ -46,6 +46,7 @@ linux:build: #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp # Regular build using the cross-compiled result or snapshot - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp + # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 linux:test: ===================================== bin/build.sh ===================================== @@ -130,13 +130,11 @@ buildit () time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } if [ "$REBUILD_LISP" = "yes" ]; then $TOOLDIR/rebuild-lisp.sh $TARGET - else - # Set the LANG to C. For whatever reason, if I (rtoy) don't - # do this on my openSuSE system, any messages from gcc are - # basically garbled. This should be harmless on other - # systems. - LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } - fi + fi + + # Set the LANG to C. For whatever reason, if I (rtoy) don't do this on my openSuSE system, + # any messages from gcc are basically garbled. This should be harmless on other systems. + LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } if [ "$BUILD_WORLD2" = "yes" ]; then ===================================== src/code/intl.lisp ===================================== @@ -51,6 +51,7 @@ Use (INTL:TEXTDOMAIN \"whatever\") in each source file to set this.") (defvar *loaded-domains* (make-hash-table :test 'equal)) (defvar *locale-aliases* (make-hash-table :test 'equal)) +(setf (gethash "en_US.UTF-8@piglatin" *locale-aliases*) "en@piglatin") (defstruct domain-entry (domain "" :type simple-base-string) ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -9083,7 +9083,8 @@ msgstr "" #: src/code/extfmts.lisp msgid "" "The default external format to use if no other external format is\n" -" specified" +" specified. This is unaffected by any locale settings or by\n" +" SET-SYSTEM-EXTERNAL-FORMAT." msgstr "" #: src/code/extfmts.lisp ===================================== tests/issues.lisp ===================================== @@ -830,7 +830,18 @@ (assert-true (stream::find-external-format :euckr)) (assert-true (stream::find-external-format :cp949)))) - +(define-test issue.154 + (:tag :issues) + (let ((old-locale intl::*locale*) + (locale "en_US.UTF-8@piglatin") + (piglatin-text "Ethay izesay ofway away eamstray inway-ufferbay.")) + (unwind-protect + (progn + (assert-equal locale (intl:setlocale "en_US.UTF-8@piglatin")) + (print (intl::find-domain "cmucl" intl::*locale*)) + (assert-equal piglatin-text (intl:dgettext "cmucl" "The size of a stream in-buffer.")) + ) + (intl:setlocale old-locale)))) (define-test issue.158 (:tag :issues) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/a2fa2dae5851e0687f525f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/a2fa2dae5851e0687f525f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] always perform translations
by Jon Boone (＠jboone) 18 Jun '23

18 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: 25c9b62a by Jon Boone at 2023-06-18T19:08:19-04:00 always perform translations - - - - - 1 changed file: - bin/build.sh Changes: ===================================== bin/build.sh ===================================== @@ -130,13 +130,11 @@ buildit () time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } if [ "$REBUILD_LISP" = "yes" ]; then $TOOLDIR/rebuild-lisp.sh $TARGET - - # Set the LANG to C. For whatever reason, if I (rtoy) don't - # do this on my openSuSE system, any messages from gcc are - # basically garbled. This should be harmless on other - # systems. - LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } - fi + fi + + # Set the LANG to C. For whatever reason, if I (rtoy) don't do this on my openSuSE system, + # any messages from gcc are basically garbled. This should be harmless on other systems. + LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } if [ "$BUILD_WORLD2" = "yes" ]; then View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/25c9b62aaa1180b63991687… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/25c9b62aaa1180b63991687… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0