Raymond Toy pushed to branch master at cmucl / cmucl

Commits: 61fd177a by Raymond Toy at 2024-07-20T02:01:13+00:00 Fix #337: Import lisp::+ascii-limit+ to the C package

- - - - - b7b29443 by Raymond Toy at 2024-07-20T02:01:16+00:00 Merge branch 'issue-337-cross-compile-linux-x86-fails' into 'master'

Fix #337: Import lisp::+ascii-limit+ to the C package

Closes #337

See merge request cmucl/cmucl!234 - - - - -

3 changed files:

- .gitlab-ci.yml - src/code/exports.lisp - src/compiler/srctran.lisp

Changes:

===================================== .gitlab-ci.yml ===================================== @@ -52,6 +52,32 @@ linux:build: # describe return something that make-dist.sh doesn't like. - bin/make-dist.sh -V `git describe --dirty` -I dist linux-4

+linux:cross-build: + stage: build + tags: + - linux + artifacts: + paths: + - xdist/ + - linux-2/*.log + - linux-3/*.log + - linux-4/*.log + needs: + + # Normally need the linux:install stage to get the compiler to + # use. But for #337, we need the normal build from linux:build to + # do the cross-compile. Once the snapshot is made, we can use + # linux:install instead. + - job: linux:build + #- job: linux:install + artifacts: true + script: + - bin/create-target.sh xtarget + - bin/create-target.sh xcross + - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp + - bin/build.sh -b xlinux $bootstrap -R -C "" -o xtarget/lisp/lisp + - bin/make-dist.sh -V `git describe --dirty` -I xdist xlinux-4 + linux:test: stage: test tags: @@ -67,6 +93,21 @@ linux:test: script: - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log

+linux:cross-test: + stage: test + tags: + - linux + artifacts: + paths: + - ansi-test/test.out + - cross-test.log + needs: + # Needs artifacts from build (dist/) + - job: linux:cross-build + artifacts: true + script: + - bin/run-unit-tests.sh -l xdist/bin/lisp 2>&1 | tee cross-test.log + linux:ansi-test: stage: ansi-test tags:

===================================== src/code/exports.lisp ===================================== @@ -1067,7 +1067,8 @@ "CHAR-TITLECASE" "TITLE-CASE-P" "GLYPH" "SGLYPH" "STRING-TO-NFC" - "CODEPOINT-LIMIT" "CODEPOINT") + "CODEPOINT-LIMIT" "CODEPOINT" + "+ASCII-LIMIT+") ;; Unicode (:export "STRING-TO-NFC" "STRING-TO-NFD" "STRING-TO-NFKC" "STRING-TO-NFKD" @@ -1858,7 +1859,8 @@ "%SP-STRING-COMPARE" "%SVSET" "%TYPEP" "SHORT-FLOAT-P" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*" - "STRING>*" "STRING>=*") + "STRING>*" "STRING>=*" + "+ASCII-LIMIT+") (:import-from "SYSTEM" "FOREIGN-SYMBOL-ADDRESS" "FOREIGN-SYMBOL-CODE-ADDRESS" "FOREIGN-SYMBOL-DATA-ADDRESS") (:import-from "EXTENSIONS"

===================================== src/compiler/srctran.lisp ===================================== @@ -3335,7 +3335,7 @@ '(let ((m (char-code x))) (cond ((<= (char-code #\a) m (char-code #\z)) (code-char (logxor m #x20))) - ((> m lisp::+ascii-limit+) + ((> m +ascii-limit+) (code-char (lisp::case-mapping-upper-case m))) (t x))))

@@ -3349,7 +3349,7 @@ '(let ((m (char-code x))) (cond ((<= (char-code #\A) m (char-code #\Z)) (code-char (logxor m #x20))) - ((> m lisp::+ascii-limit+) + ((> m +ascii-limit+) (code-char (lisp::case-mapping-lower-case m))) (t x))))

View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ba2176abe77531cdd4c2468...