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

[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

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] removing debugging output
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: 82349026 by Jon Boone at 2023-06-18T10:15:22-04:00 removing debugging output - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -45,12 +45,9 @@ linux:build: #- bin/create-target.sh xcross x86_linux_clang #- 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 - - ls -laR snapshot/lib/cmucl/lib/locale - 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 - - ls -laR linux-4/i18n/locale - bin/make-dist.sh -I dist linux-4 - - ls -laR dist/lib/cmucl/lib/locale linux:test: stage: test @@ -65,7 +62,6 @@ linux:test: - job: linux:build artifacts: true script: - - ls -laR dist/lib/cmucl/lib/locale/ - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log linux:ansi-test: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/823490269cef6481337aed5… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/823490269cef6481337aed5… 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] Revert "adding diagnostic message about POT"
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: 67c1653f by Jon Boone at 2023-06-18T10:09:35-04:00 Revert "adding diagnostic message about POT" This reverts commit c24b478baec3bde7afc58e67c827ed5ec7e3483a. - - - - - 1 changed file: - bin/build.sh Changes: ===================================== bin/build.sh ===================================== @@ -246,7 +246,6 @@ if [ "${BUILD_POT}" = "yes" ]; then fi BUILD=3 -echo "MAKE_TARGET = ${MAKE_TARGET}" buildit # Asdf and friends are part of the base install, so we need to build View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/67c1653f3a535968b051777… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/67c1653f3a535968b051777… 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] Revert " adds translations diagnostic ouput to GNUmakefile"
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: 99d7498d by Jon Boone at 2023-06-18T10:04:23-04:00 Revert " adds translations diagnostic ouput to GNUmakefile" This reverts commit cb69ee793b7eb1c1e0842b5687f857ddfdf3f364. - - - - - 1 changed file: - src/lisp/GNUmakefile Changes: ===================================== src/lisp/GNUmakefile ===================================== @@ -106,7 +106,6 @@ LOCALE_DIRS = $(patsubst %, i18n/locale/%/LC_MESSAGES, $(LOCALES)) # FreeBSD, it moves the line to after the Language-Team line. This # makes things messy. Hence, sort and diff. translations: - echo "making translations"; \ for pot in ../../src/i18n/locale/*.pot; do \ for po in $(LOCALE_DIRS); do \ d=`dirname $$pot`; \ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/99d7498da3e3377c0fba7d7… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/99d7498da3e3377c0fba7d7… 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] removed the else clause and forced making of the translations
by Jon Boone (＠jboone) 17 Jun '23

17 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: 46c05267 by Jon Boone at 2023-06-17T15:50:48-04:00 removed the else clause and forced making of the translations - - - - - 1 changed file: - bin/build.sh Changes: ===================================== bin/build.sh ===================================== @@ -130,14 +130,13 @@ buildit () time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } if [ "$REBUILD_LISP" = "yes" ]; then $TOOLDIR/rebuild-lisp.sh $TARGET - fi - # 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 + LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } + fi if [ "$BUILD_WORLD2" = "yes" ]; then View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/46c052670500a412d3b8a4f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/46c052670500a412d3b8a4f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch resolve-mr-for-issue-154-piglatin-translation-doesnt-work-anymore
by Jon Boone (＠jboone) 17 Jun '23

17 Jun '23

Jon Boone pushed new branch resolve-mr-for-issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/resolve-mr-for-issue-154-… 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] testing removal of conditional
by Jon Boone (＠jboone) 17 Jun '23

17 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: 28c7d555 by Jon Boone at 2023-06-17T14:14:17-04:00 testing removal of conditional - - - - - 1 changed file: - bin/build.sh Changes: ===================================== bin/build.sh ===================================== @@ -130,13 +130,14 @@ buildit () time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } if [ "$REBUILD_LISP" = "yes" ]; then $TOOLDIR/rebuild-lisp.sh $TARGET - else + fi + # 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 + # LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } + # fi if [ "$BUILD_WORLD2" = "yes" ]; then View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/28c7d55558a33943f2b0c68… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/28c7d55558a33943f2b0c68… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-242-c-call-char-result-wrong] Fix silly typo introduced in last commit
by Raymond Toy (＠rtoy) 16 Jun '23

16 Jun '23

Raymond Toy pushed to branch issue-242-c-call-char-result-wrong at cmucl / cmucl Commits: f5ad7b01 by Raymond Toy at 2023-06-16T07:20:26-07:00 Fix silly typo introduced in last commit - - - - - 1 changed file: - src/code/alieneval.lisp Changes: ===================================== src/code/alieneval.lisp ===================================== @@ -173,7 +173,7 @@ ;; ;; Method that accepts the alien type and the alien value. The ;; method converts the alien value into an appropriate lisp value. - (naturalize-gen nil :type (or null function) + (naturalize-gen nil :type (or null function)) (deport-gen nil :type (or null function)) ;; Cast? (arg-tn nil :type (or null function)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f5ad7b01e50ec09ee333ecf… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f5ad7b01e50ec09ee333ecf… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-242-c-call-char-result-wrong] Add original C test from the bug report.
by Raymond Toy (＠rtoy) 16 Jun '23

16 Jun '23

Raymond Toy pushed to branch issue-242-c-call-char-result-wrong at cmucl / cmucl Commits: e8c35cb7 by Raymond Toy at 2023-06-16T07:07:11-07:00 Add original C test from the bug report. Add tests for this as well from the original bug report and an additional test that uses alien:boolean as the return type. - - - - - 2 changed files: - tests/issues.lisp - tests/test-return.c Changes: ===================================== tests/issues.lisp ===================================== @@ -1004,7 +1004,7 @@ (- n #x100) n)))) (dolist (x '(99 -99 1023 -1023)) - (assert-equal (sign-extend x) (fun x))))) + (assert-equal (sign-extend x) (fun x) x)))) (define-test issue.242.test-alien-return-signed-short (:tag :issues) @@ -1019,7 +1019,7 @@ (- n #x10000) n)))) (dolist (x '(1023 -1023 100000 -100000)) - (assert-equal (sign-extend x) (fun x))))) + (assert-equal (sign-extend x) (fun x) x)))) (define-test issue.242.test-alien-return-signed-int (:tag :issues) @@ -1029,7 +1029,7 @@ (function c-call:int c-call:int)) n))) (dolist (x '(1023 -1023 #x7fffffff #x-80000000)) - (assert-equal x (fun x))))) + (assert-equal x (fun x) x)))) (define-test issue.242.test-alien-return-unsigned-char (:tag :issues) @@ -1041,7 +1041,7 @@ (expected (n) (ldb (byte 8 0) n))) (dolist (x '(99 -99 1023 -1023)) - (assert-equal (expected x) (fun x))))) + (assert-equal (expected x) (fun x) x)))) (define-test issue.242.test-alien-return-unsigned-short (:tag :issues) @@ -1053,7 +1053,7 @@ (expected (n) (ldb (byte 16 0) n))) (dolist (x '(1023 -1023 100000 -100000)) - (assert-equal (expected x) (fun x))))) + (assert-equal (expected x) (fun x) x)))) (define-test issue.242.test-alien-return-unsigned-int (:tag :issues) @@ -1065,4 +1065,30 @@ (expected (n) (ldb (byte 32 0) n))) (dolist (x '(1023 -1023 #x7fffffff #x-80000000)) - (assert-equal (expected x) (fun x))))) + (assert-equal (expected x) (fun x) x)))) + +(define-test issue.242.test-alien-return-bool + (:tag :issues) + (flet ((fun (n) + (alien:alien-funcall + (alien:extern-alien "unsigned_to_bool" + (function c-call:char c-call:unsigned-int)) + n)) + (expected (n) + (if (zerop n) + 0 + 1))) + (dolist (x '(0 1 1000)) + (assert-equal (expected x) (fun x) x)))) + +(define-test issue.242.test-alien-return-bool.2 + (:tag :issues) + (flet ((fun (n) + (alien:alien-funcall + (alien:extern-alien "unsigned_to_bool" + (function alien:boolean c-call:unsigned-int)) + n)) + (expected (n) + (not (zerop n)))) + (dolist (x '(0 1 1000)) + (assert-equal (expected x) (fun x) x)))) ===================================== tests/test-return.c ===================================== @@ -1,3 +1,5 @@ +#include <stdbool.h> + signed char int_to_signed_char(int x) { @@ -19,18 +21,23 @@ int_to_int(int x) unsigned char int_to_unsigned_char(int x) { - return (signed char) x; + return (unsigned char) x; } unsigned short int_to_unsigned_short(int x) { - return (signed short) x; + return (unsigned short) x; } unsigned int int_to_unsigned_int(int x) { - return (int) x; + return (unsigned int) x; +} + +_Bool unsigned_to_bool(unsigned u) +{ + return (_Bool) u; } View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e8c35cb738dbac4d469d70c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e8c35cb738dbac4d469d70c… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0