Skip to content

use restart to accept junk char. #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
snmsts wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use restart to accept junk char. #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 33 additions & 17 deletions src/enc-jpn.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,17 +466,33 @@
(cp932 (parse-integer (subseq line 26 30) :radix 16)))
(setf (gethash ucs *ucs-to-cp932-hash*) cp932)))))

(defun eucjp-to-ucs (code)
(values (gethash code *eucjp-to-ucs-hash*)))
(defun eucjp-to-ucs (code index)
(or
(gethash code *eucjp-to-ucs-hash*)
(restart-case
(decoding-error code :eucjp +repl+ index)
(retry-code (value) value))))

(defun ucs-to-eucjp (code)
(values (gethash code *ucs-to-eucjp-hash*)))
(defun ucs-to-eucjp (code index)
(or
(gethash code *ucs-to-eucjp-hash*)
(restart-case
(encoding-error code :eucjp +repl+ index)
(retry-code (value) value))))

(defun cp932-to-ucs (code)
(values (gethash code *cp932-to-ucs-hash*)))
(defun cp932-to-ucs (code index)
(or
(gethash code *cp932-to-ucs-hash*)
(restart-case
(decoding-error code :cp932 +repl+ index)
(retry-code (value) value))))

(defun ucs-to-cp932 (code)
(values (gethash code *ucs-to-cp932-hash*)))
(defun ucs-to-cp932 (code index)
(or
(gethash code *ucs-to-cp932-hash*)
(restart-case
(encoding-error code :cp932 +repl+ index)
(retry-code (value) value))))

;;;; EUC-JP

Expand All @@ -495,7 +511,7 @@ in 2 to 3 bytes."
(loop with noctets fixnum = 0
for i fixnum from start below end
for code of-type code-point = (,getter seq i)
do (let* ((c (ucs-to-eucjp code))
do (let* ((c (ucs-to-eucjp code i))
(new (+ (cond ((< #xffff c) 3)
((< #xff c) 2)
(t 1))
Expand Down Expand Up @@ -549,7 +565,7 @@ in 2 to 3 bytes."
for i fixnum from start below end
for code of-type code-point = (,getter src i)
for eucjp of-type code-point
= (ucs-to-eucjp code) do
= (ucs-to-eucjp code i) do
(macrolet ((set-octet (offset value)
`(,',setter ,value dest (the fixnum (+ di ,offset)))))
(cond
Expand Down Expand Up @@ -613,15 +629,15 @@ in 2 to 3 bytes."
(setq u2 (consume-octet))
(eucjp-to-ucs (logior #x8f0000
(f-ash u2 8)
(consume-octet))))
(consume-octet)) i))
;; 2 octets
((or (= u1 #x8e)
(< #xa0 u1 #xff))
(eucjp-to-ucs (logior (f-ash u1 8)
(consume-octet))))
(consume-octet)) i))
;; 1 octet
(t
(eucjp-to-ucs u1))))
(eucjp-to-ucs u1 i))))
dest di))
finally (return (the fixnum (- di d-start)))))))

Expand All @@ -642,7 +658,7 @@ in 2 bytes."
(loop with noctets fixnum = 0
for i fixnum from start below end
for code of-type code-point = (,getter seq i)
do (let* ((c (ucs-to-cp932 code))
do (let* ((c (ucs-to-cp932 code i))
(new (+ (cond ((< #xff c) 2)
(t 1))
noctets)))
Expand Down Expand Up @@ -695,7 +711,7 @@ in 2 bytes."
for i fixnum from start below end
for code of-type code-point = (,getter src i)
for cp932 of-type code-point
= (ucs-to-cp932 code) do
= (ucs-to-cp932 code i) do
(macrolet ((set-octet (offset value)
`(,',setter ,value dest (the fixnum (+ di ,offset)))))
(cond
Expand Down Expand Up @@ -759,9 +775,9 @@ in 2 bytes."
(<= #xe0 u1 #xfc))
(setq u2 (consume-octet))
(cp932-to-ucs (logior (f-ash u1 8)
u2)))
u2) i))
;; 1 octet
(t
(cp932-to-ucs u1))))
(cp932-to-ucs u1 i))))
dest di))
finally (return (the fixnum (- di d-start)))))))
8 changes: 6 additions & 2 deletions src/packages.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@
#:character-out-of-range
#:invalid-utf8-starter-byte
#:invalid-utf8-continuation-byte
#:overlong-utf8-sequence))
#:overlong-utf8-sequence
;; restart
#:retry-code))

(defpackage #:babel
(:use #:common-lisp #:babel-encodings #:alexandria)
Expand Down Expand Up @@ -112,4 +114,6 @@
#:character-out-of-range
#:invalid-utf8-starter-byte
#:invalid-utf8-continuation-byte
#:overlong-utf8-sequence))
#:overlong-utf8-sequence
;; restart
#:retry-code))