GitLab

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.

Fix typo in utf-32-be:  Remove extra closing paren

     ;; 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)

     ;; 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)

   (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

 	      (out ,code)))))

   ()

   ()

-  (code-to-octets (code state error)

+  (octet-count (code state error)

     `(cond ((lisp::surrogatep ,code)

 	    (if ,error

 		(locally

 		;; Replacement character is 2 octets

 		2))

 	   (t

-	    4)))))
+	    4))))
 	      (out ,code)))))

   ()

   ()

-  (code-to-octets (code state error)

+  (octet-count (code state error)

     `(cond ((lisp::surrogatep ,code)

 	    (if ,error

 		(locally

   (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

Raymond Toy pushed to branch issue-367-count-octets-for-encoding at cmucl / cmucl

Commits:

6 changed files:

Changes: