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

[Git][cmucl/cmucl][master] 2 commits: Fix #369: Better docstring for unix-setlocale
by Raymond Toy (＠rtoy) 28 Jan '25

28 Jan '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 5f94e404 by Raymond Toy at 2025-01-28T15:50:59+00:00 Fix #369: Better docstring for unix-setlocale - - - - - 4bc3e3f4 by Raymond Toy at 2025-01-28T15:50:59+00:00 Merge branch 'issue-369-unix-setlocale-docstring' into 'master' Fix #369: Better docstring for unix-setlocale Closes #369 See merge request cmucl/cmucl!263 - - - - - 2 changed files: - src/code/unix.lisp - src/i18n/locale/cmucl-unix.pot Changes: ===================================== src/code/unix.lisp ===================================== @@ -2873,7 +2873,10 @@ (int-syscall ("fork"))) (defun unix-setlocale () - _N"Call setlocale(3c) with fixed args. Returns 0 on success." + _N"Set all the categories of the locale according to the values of + the environment variables by calling 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/-/compare/98961a8b36f5608e3c0475… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/98961a8b36f5608e3c0475… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-369-unix-setlocale-docstring] Fix typo in docstring introduced in previous commit
by Raymond Toy (＠rtoy) 28 Jan '25

28 Jan '25

Raymond Toy pushed to branch issue-369-unix-setlocale-docstring at cmucl / cmucl Commits: 7b418580 by Raymond Toy at 2025-01-28T06:16:55-08:00 Fix typo in docstring introduced in previous commit - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2874,7 +2874,7 @@ (defun unix-setlocale () _N"Set all the categories of the locale according to the values of - the environment variables calling setlocale(LC_ALL, \"\"). + the environment variables by calling setlocale(LC_ALL, \"\"). Returns 0 on success and -1 if setlocale failed." (alien:alien-funcall View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7b418580c66ac4340adb53b… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7b418580c66ac4340adb53b… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-369-unix-setlocale-docstring] Apply suggested changes from review.
by Raymond Toy (＠rtoy) 28 Jan '25

28 Jan '25

Raymond Toy pushed to branch issue-369-unix-setlocale-docstring at cmucl / cmucl Commits: 7dc1d888 by Raymond Toy at 2025-01-28T06:15:37-08:00 Apply suggested changes from review. - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2873,8 +2873,8 @@ (int-syscall ("fork"))) (defun unix-setlocale () - _N"Set all the categories of the locale from the values of the - environment variables using setlocale(LC_ALL, \"\"). + _N"Set all the categories of the locale according to the values of + the environment variables calling setlocale(LC_ALL, \"\"). Returns 0 on success and -1 if setlocale failed." (alien:alien-funcall View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7dc1d888b781f465357bba9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7dc1d888b781f465357bba9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #364: Add interface to mkstemp and mkdtemp
by Raymond Toy (＠rtoy) 28 Jan '25

28 Jan '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 9ea51cb2 by Raymond Toy at 2025-01-28T14:14:09+00:00 Fix #364: Add interface to mkstemp and mkdtemp - - - - - 98961a8b by Raymond Toy at 2025-01-28T14:14:10+00:00 Merge branch 'issue-364-add-mkstemp-mkdtemp' into 'master' Fix #364: Add interface to mkstemp and mkdtemp Closes #364 See merge request cmucl/cmucl!260 - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2900,3 +2900,32 @@ (extern-alien "os_get_locale_codeset" (function (* char)))) c-string)) + +(defun unix-mkstemp (template) + _N"Generates a unique temporary file name from TEMPLATE, and creates + and opens the file. On success, the corresponding file descriptor + and name of the file is returned. + + The last six characters of the template must be \"XXXXXX\"." + ;; Hope this buffer is large enough! + (let ((octets (%name->file template))) + (syscall ("mkstemp" c-call:c-string) + (values result + ;; Convert the file name back to a Lisp string. + (%file->name octets)) + octets))) + +(defun unix-mkdtemp (template) + _N"Generate a uniquely named temporary directory from Template, + which must have \"XXXXXX\" as the last six characters. The + directory is created with permissions 0700. The name of the + directory is returned." + (let* ((octets (%name->file template)) + (result (alien-funcall + (extern-alien "mkdtemp" + (function (* char) + c-call:c-string)) + octets))) + (if (null-alien result) + (values nil (unix-errno)) + (%file->name octets)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/fbe6f2d65cf23592a74ec5… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/fbe6f2d65cf23592a74ec5… 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] Update pot file for new docstrings
by Raymond Toy (＠rtoy) 17 Jan '25

17 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: 3f19d402 by Raymond Toy at 2025-01-16T19:36:41-08:00 Update pot file for new docstrings - - - - - 1 changed file: - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -9300,6 +9300,13 @@ msgid "" " external format." msgstr "" +#: src/code/extfmts.lisp +msgid "" +"Compute the number of octets needed to convert String using the\n" +" specified External-format. The string is bound by Start (defaulting\n" +" to 0) and End (defaulting to the end of the string)." +msgstr "" + #: src/code/extfmts.lisp msgid "" "Encode the given String using External-Format and return a new\n" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3f19d40275a95d5f6d69fce… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3f19d40275a95d5f6d69fce… 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] Actually use random state in the generator
by Raymond Toy (＠rtoy) 15 Jan '25

15 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: f859892f by Raymond Toy at 2025-01-15T11:52:51-08:00 Actually use random state in the generator We created a random state to use for generating the test strings, but we didn't actually use the state with `random`. Do so now. - - - - - 1 changed file: - tests/external-formats.lisp Changes: ===================================== tests/external-formats.lisp ===================================== @@ -9,14 +9,14 @@ (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)))) + collect (random 256 rs)))) "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)))) + collect (random 20000 rs)))) "Random test string with codepoints below 20000") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f859892fe82927e2f8ce5a2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f859892fe82927e2f8ce5a2… 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] Hack to handle composing formats in string-octet-count
by Raymond Toy (＠rtoy) 15 Jan '25

15 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: afc9afb0 by Raymond Toy at 2025-01-15T09:04:00-08:00 Hack to handle composing formats in string-octet-count I can't figure out how to make `string-octet-count` work when using composing formats (like (:latin1 :crlf) to output CR/LF for every LF). As a workaround, if the external format is a composing format, use `string-to-octets` to get the number of octets. This is not great, but allows `string-octet-count` to work with composing formats. - - - - - 1 changed file: - src/code/extfmts.lisp Changes: ===================================== src/code/extfmts.lisp ===================================== @@ -1165,9 +1165,21 @@ character and illegal outputs are replaced by a question mark.") "Compute the number of octets needed to convert String using the specified External-format. The string is bound by Start (defaulting to 0) and End (defaulting to the end of the string)." - (lisp::with-array-data ((string string) (start start) (end end)) - (funcall (ef-string-octet-count external-format) - string start end error))) + (let ((composing-format-p + ;; Determine is the external format is a composing format + ;; which we determine by seeing that the name of the format + ;; is a cons. Probably not the best way. + (consp (ef-name (find-external-format external-format))))) + ;; We currently don't know how to get just the number of octets + ;; when a composing external format is used. As a workaround, use + ;; STRING-TO-OCTETS to find the number of octets. + (if composing-format-p + (nth-value 1 + (string-to-octets string :start start :end end + :external-format external-format)) + (lisp::with-array-data ((string string) (start start) (end end)) + (funcall (ef-string-octet-count external-format) + string start end error))))) (def-ef-macro ef-encode (extfmt lisp::lisp +ef-max+ +ef-en+) `(lambda (string start end result error &aux (ptr 0) (state nil)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/afc9afb0e69ec877fafa02b… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/afc9afb0e69ec877fafa02b… 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] Rename def-ef-macro ef-octet-count to ef-string-octet-count
by Raymond Toy (＠rtoy) 15 Jan '25

15 Jan '25

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl Commits: 1a5889eb by Raymond Toy at 2025-01-14T21:18:44-08:00 Rename def-ef-macro ef-octet-count to ef-string-octet-count It's a bit confusing to use `ef-octet-count` defined by `def-ef-macro` and also have a function named `ef-octet-count`. Thus, rename it. While were at it, add a docstring for `string-octet-count`. - - - - - 1 changed file: - src/code/extfmts.lisp Changes: ===================================== src/code/extfmts.lisp ===================================== @@ -1155,15 +1155,18 @@ character and illegal outputs are replaced by a question mark.") (values (if stringp string (lisp::shrink-vector string pos)) (- pos s-start) last-octet new-state)))) -(def-ef-macro ef-octet-count (extfmt lisp::lisp +ef-max+ +ef-oc+) +(def-ef-macro ef-string-octet-count (extfmt lisp::lisp +ef-max+ +ef-oc+) `(lambda (string start end error &aux (total 0) (state nil)) (dotimes (i (- end start) total) (incf total (octet-count ,extfmt (schar string (+ start i)) state error))))) (defun string-octet-count (string &key (start 0) end (external-format :default) error) + "Compute the number of octets needed to convert String using the + specified External-format. The string is bound by Start (defaulting + to 0) and End (defaulting to the end of the string)." (lisp::with-array-data ((string string) (start start) (end end)) - (funcall (ef-octet-count external-format) + (funcall (ef-string-octet-count external-format) string start end error))) (def-ef-macro ef-encode (extfmt lisp::lisp +ef-max+ +ef-en+) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1a5889ebc36c14498e1cffa… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1a5889ebc36c14498e1cffa… 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: Add test that errors are signaled in string-octet-count
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: 02be9b8b by Raymond Toy at 2025-01-13T13:19:18-08:00 Add test that errors are signaled in string-octet-count Just test that we signal an error when converting a string to :ascii. - - - - - 06488aeb by Raymond Toy at 2025-01-13T13:25:19-08:00 Add some sanity checks for STRING-TO-OCTETS Since `string-to-octets` can return a buffer of octets whose length is not the same as the returned number of octets, add a check that they are the same. If not, then we `string-octet-count` may not be consistent. Also add a check that the converted number of characters matches the length of the string. - - - - - 1 changed file: - tests/external-formats.lisp Changes: ===================================== tests/external-formats.lisp ===================================== @@ -20,9 +20,22 @@ "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))) + "Test that STRING-OCTET-COUNT returns the correct number of octets" + ;; We expect STRING-OCTET-COUNT returns the same number of octets + ;; that are produced by STRING-TO-OCTETS. + `(multiple-value-bind (octets count converted) + (stream:string-to-octets ,string :external-format ,format) + ;; While we're at it, make sure that the length of the octet + ;; buffer matches returned count. And make sure we converted all + ;; the characters in the string. + (assert-equal (length octets) count) + (assert-equal (length ,string) converted) + ;; Finally, make sure that STRING-OCTET-COUNT returns the same + ;; number of octets from STRING-TO-OCTETS. + (assert-equal (length octets) + (stream::string-octet-count ,string :external-format ,format)))) (define-test octet-count.iso8859-1 (:tag :octet-count) @@ -32,6 +45,13 @@ (:tag :octet-count) (test-octet-count *test-iso8859-1* :ascii)) +(define-test octet-count.ascii.error + (:tag :octet-count) + (assert-error 'simple-error + (stream::string-octet-count *test-iso8859-1* + :external-format :ascii + :error 'error))) + (define-test octet-count.utf-8 (:tag :octet-count) (test-octet-count *test-unicode* :utf-8)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ccd15fcecd9a55e61b22a7… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ccd15fcecd9a55e61b22a7… 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 octet-count for mac-roman format with corresponding test
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: ccd15fce by Raymond Toy at 2025-01-13T12:40:36-08:00 Add octet-count for mac-roman format with corresponding test This also means all the cp12??, koi8-5, mac-greek, mac-icelandic, mac-latin2, and mac-turkish also has octet-count now too since mac-roman is the base for these other formats. - - - - - 2 changed files: - src/pcl/simple-streams/external-formats/mac-roman.lisp - tests/external-formats.lisp Changes: ===================================== src/pcl/simple-streams/external-formats/mac-roman.lisp ===================================== @@ -49,4 +49,19 @@ character and illegal outputs are replaced by a question mark.") (declare (optimize (ext:inhibit-warnings 3))) (funcall ,error "Cannot output codepoint #x~X to MAC-ROMAN stream" ,code)) - #x3F))))))) + #x3F)))))) + () + () + (octet-count (code state error present) + `(if (< ,code 128) + 1 + (let ((,present (get-inverse ,itable ,code))) + (if ,present + 1 + (if ,error + (locally + ;; No warnings about fdefinition + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error "Cannot output codepoint #x~X to MAC-ROMAN stream" + ,code)) + 1)))))) ===================================== tests/external-formats.lisp ===================================== @@ -108,5 +108,8 @@ (:tag :octet-count) (test-octet-count *test-iso8859-1* :iso8859-15)) - +(define-test octet-count.mac-roman + (:tag :octet-count) + (test-octet-count *test-iso8859-1* :mac-roman)) + View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ccd15fcecd9a55e61b22a7f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ccd15fcecd9a55e61b22a7f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0