X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fexternal-formats%2Fenc-dos.lisp;h=0b8ea9971000732a7022f2205eba0065de59ae67;hb=95591ed483dbb8c0846c129953acac1554f28809;hp=edb9457826cb21e6cbdb5bb1ab1525d8aeb41356;hpb=54b330585ed41edeb93a289f0e59aec67fa9ded9;p=sbcl.git diff --git a/src/code/external-formats/enc-dos.lisp b/src/code/external-formats/enc-dos.lisp index edb9457..0b8ea99 100644 --- a/src/code/external-formats/enc-dos.lisp +++ b/src/code/external-formats/enc-dos.lisp @@ -1,4 +1,4 @@ -(in-package #:sb!impl) +(in-package "SB!IMPL") (define-unibyte-mapper cp437->code-mapper code->cp437-mapper (#x80 #x00C7) ; LATIN CAPITAL LETTER C WITH CEDILLA @@ -132,11 +132,11 @@ ) (declaim (inline get-cp437-bytes)) -(defun get-cp437-bytes(string pos end) +(defun get-cp437-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp437-mapper :cp437 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp437-mapper :cp437 string pos)) (defun string->cp437 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -160,10 +160,6 @@ (instantiate-octets-definition define-cp437->string) -(push '((:cp437 :|cp437|) - cp437->string-aref string->cp437) - *external-format-functions*) - (define-external-format (:cp437 :|cp437|) 1 t (let ((cp437-byte (code->cp437-mapper bits))) @@ -173,7 +169,9 @@ (let ((code (cp437->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp437->string-aref + string->cp437) ;; TODO -- error check (define-unibyte-mapper cp850->code-mapper code->cp850-mapper (#x80 #x00C7) ; LATIN CAPITAL LETTER C WITH CEDILLA @@ -307,11 +305,11 @@ ) (declaim (inline get-cp850-bytes)) -(defun get-cp850-bytes(string pos end) +(defun get-cp850-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp850-mapper :cp850 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp850-mapper :cp850 string pos)) (defun string->cp850 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -335,10 +333,6 @@ (instantiate-octets-definition define-cp850->string) -(push '((:cp850 :|cp850|) - cp850->string-aref string->cp850) - *external-format-functions*) - (define-external-format (:cp850 :|cp850|) 1 t (let ((cp850-byte (code->cp850-mapper bits))) @@ -348,7 +342,9 @@ (let ((code (cp850->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp850->string-aref + string->cp850) ;; TODO -- error check (define-unibyte-mapper cp852->code-mapper code->cp852-mapper (#x80 #x00C7) ; LATIN CAPITAL LETTER C WITH CEDILLA @@ -482,11 +478,11 @@ ) (declaim (inline get-cp852-bytes)) -(defun get-cp852-bytes(string pos end) +(defun get-cp852-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp852-mapper :cp852 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp852-mapper :cp852 string pos)) (defun string->cp852 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -510,10 +506,6 @@ (instantiate-octets-definition define-cp852->string) -(push '((:cp852 :|cp852|) - cp852->string-aref string->cp852) - *external-format-functions*) - (define-external-format (:cp852 :|cp852|) 1 t (let ((cp852-byte (code->cp852-mapper bits))) @@ -523,7 +515,9 @@ (let ((code (cp852->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp852->string-aref + string->cp852) ;; TODO -- error check (define-unibyte-mapper cp855->code-mapper code->cp855-mapper (#x80 #x0452) ; CYRILLIC SMALL LETTER DJE @@ -657,11 +651,11 @@ ) (declaim (inline get-cp855-bytes)) -(defun get-cp855-bytes(string pos end) +(defun get-cp855-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp855-mapper :cp855 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp855-mapper :cp855 string pos)) (defun string->cp855 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -685,10 +679,6 @@ (instantiate-octets-definition define-cp855->string) -(push '((:cp855 :|cp855|) - cp855->string-aref string->cp855) - *external-format-functions*) - (define-external-format (:cp855 :|cp855|) 1 t (let ((cp855-byte (code->cp855-mapper bits))) @@ -698,7 +688,9 @@ (let ((code (cp855->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp855->string-aref + string->cp855) ;; TODO -- error check (define-unibyte-mapper cp857->code-mapper code->cp857-mapper (#x80 #x00C7) ; LATIN CAPITAL LETTER C WITH CEDILLA @@ -831,11 +823,11 @@ ) (declaim (inline get-cp857-bytes)) -(defun get-cp857-bytes(string pos end) +(defun get-cp857-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp857-mapper :cp857 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp857-mapper :cp857 string pos)) (defun string->cp857 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -859,10 +851,6 @@ (instantiate-octets-definition define-cp857->string) -(push '((:cp857 :|cp857|) - cp857->string-aref string->cp857) - *external-format-functions*) - (define-external-format (:cp857 :|cp857|) 1 t (let ((cp857-byte (code->cp857-mapper bits))) @@ -872,7 +860,9 @@ (let ((code (cp857->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp857->string-aref + string->cp857) ;; TODO -- error check (define-unibyte-mapper cp860->code-mapper code->cp860-mapper (#x80 #x00C7) ; LATIN CAPITAL LETTER C WITH CEDILLA @@ -1006,11 +996,11 @@ ) (declaim (inline get-cp860-bytes)) -(defun get-cp860-bytes(string pos end) +(defun get-cp860-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp860-mapper :cp860 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp860-mapper :cp860 string pos)) (defun string->cp860 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -1034,10 +1024,6 @@ (instantiate-octets-definition define-cp860->string) -(push '((:cp860 :|cp860|) - cp860->string-aref string->cp860) - *external-format-functions*) - (define-external-format (:cp860 :|cp860|) 1 t (let ((cp860-byte (code->cp860-mapper bits))) @@ -1047,7 +1033,9 @@ (let ((code (cp860->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp860->string-aref + string->cp860) ;; TODO -- error check (define-unibyte-mapper cp861->code-mapper code->cp861-mapper (#x80 #x00C7) ; LATIN CAPITAL LETTER C WITH CEDILLA @@ -1181,11 +1169,11 @@ ) (declaim (inline get-cp861-bytes)) -(defun get-cp861-bytes(string pos end) +(defun get-cp861-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp861-mapper :cp861 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp861-mapper :cp861 string pos)) (defun string->cp861 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -1209,10 +1197,6 @@ (instantiate-octets-definition define-cp861->string) -(push '((:cp861 :|cp861|) - cp861->string-aref string->cp861) - *external-format-functions*) - (define-external-format (:cp861 :|cp861|) 1 t (let ((cp861-byte (code->cp861-mapper bits))) @@ -1222,7 +1206,9 @@ (let ((code (cp861->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp861->string-aref + string->cp861) ;; TODO -- error check (define-unibyte-mapper cp862->code-mapper code->cp862-mapper (#x80 #x05D0) ; HEBREW LETTER ALEF @@ -1356,11 +1342,11 @@ ) (declaim (inline get-cp862-bytes)) -(defun get-cp862-bytes(string pos end) +(defun get-cp862-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp862-mapper :cp862 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp862-mapper :cp862 string pos)) (defun string->cp862 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -1384,10 +1370,6 @@ (instantiate-octets-definition define-cp862->string) -(push '((:cp862 :|cp862|) - cp862->string-aref string->cp862) - *external-format-functions*) - (define-external-format (:cp862 :|cp862|) 1 t (let ((cp862-byte (code->cp862-mapper bits))) @@ -1397,7 +1379,9 @@ (let ((code (cp862->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp862->string-aref + string->cp862) ;; TODO -- error check (define-unibyte-mapper cp863->code-mapper code->cp863-mapper (#x80 #x00C7) ; LATIN CAPITAL LETTER C WITH CEDILLA @@ -1531,11 +1515,11 @@ ) (declaim (inline get-cp863-bytes)) -(defun get-cp863-bytes(string pos end) +(defun get-cp863-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp863-mapper :cp863 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp863-mapper :cp863 string pos)) (defun string->cp863 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -1559,10 +1543,6 @@ (instantiate-octets-definition define-cp863->string) -(push '((:cp863 :|cp863|) - cp863->string-aref string->cp863) - *external-format-functions*) - (define-external-format (:cp863 :|cp863|) 1 t (let ((cp863-byte (code->cp863-mapper bits))) @@ -1572,7 +1552,9 @@ (let ((code (cp863->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp863->string-aref + string->cp863) ;; TODO -- error check (define-unibyte-mapper cp864->code-mapper code->cp864-mapper (#x80 #x00B0) ; DEGREE SIGN @@ -1703,11 +1685,11 @@ ) (declaim (inline get-cp864-bytes)) -(defun get-cp864-bytes(string pos end) +(defun get-cp864-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp864-mapper :cp864 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp864-mapper :cp864 string pos)) (defun string->cp864 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -1731,10 +1713,6 @@ (instantiate-octets-definition define-cp864->string) -(push '((:cp864 :|cp864|) - cp864->string-aref string->cp864) - *external-format-functions*) - (define-external-format (:cp864 :|cp864|) 1 t (let ((cp864-byte (code->cp864-mapper bits))) @@ -1744,7 +1722,9 @@ (let ((code (cp864->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp864->string-aref + string->cp864) ;; TODO -- error check (define-unibyte-mapper cp865->code-mapper code->cp865-mapper (#x80 #x00C7) ; LATIN CAPITAL LETTER C WITH CEDILLA @@ -1878,11 +1858,11 @@ ) (declaim (inline get-cp865-bytes)) -(defun get-cp865-bytes(string pos end) +(defun get-cp865-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp865-mapper :cp865 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp865-mapper :cp865 string pos)) (defun string->cp865 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -1906,10 +1886,6 @@ (instantiate-octets-definition define-cp865->string) -(push '((:cp865 :|cp865|) - cp865->string-aref string->cp865) - *external-format-functions*) - (define-external-format (:cp865 :|cp865|) 1 t (let ((cp865-byte (code->cp865-mapper bits))) @@ -1919,7 +1895,9 @@ (let ((code (cp865->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp865->string-aref + string->cp865) ;; TODO -- error check (define-unibyte-mapper cp866->code-mapper code->cp866-mapper (#x80 #x0410) ; CYRILLIC CAPITAL LETTER A @@ -2053,11 +2031,11 @@ ) (declaim (inline get-cp866-bytes)) -(defun get-cp866-bytes(string pos end) +(defun get-cp866-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp866-mapper :cp866 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp866-mapper :cp866 string pos)) (defun string->cp866 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -2081,10 +2059,6 @@ (instantiate-octets-definition define-cp866->string) -(push '((:cp866 :|cp866|) - cp866->string-aref string->cp866) - *external-format-functions*) - (define-external-format (:cp866 :|cp866|) 1 t (let ((cp866-byte (code->cp866-mapper bits))) @@ -2094,7 +2068,9 @@ (let ((code (cp866->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp866->string-aref + string->cp866) ;; TODO -- error check (define-unibyte-mapper cp869->code-mapper code->cp869-mapper (#x80 nil) @@ -2228,11 +2204,11 @@ ) (declaim (inline get-cp869-bytes)) -(defun get-cp869-bytes(string pos end) +(defun get-cp869-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp869-mapper :cp869 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp869-mapper :cp869 string pos)) (defun string->cp869 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -2256,10 +2232,6 @@ (instantiate-octets-definition define-cp869->string) -(push '((:cp869 :|cp869|) - cp869->string-aref string->cp869) - *external-format-functions*) - (define-external-format (:cp869 :|cp869|) 1 t (let ((cp869-byte (code->cp869-mapper bits))) @@ -2269,7 +2241,9 @@ (let ((code (cp869->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp869->string-aref + string->cp869) ;; TODO -- error check (define-unibyte-mapper cp874->code-mapper code->cp874-mapper (#x80 #x20AC) ; EURO SIGN @@ -2402,11 +2376,11 @@ ) (declaim (inline get-cp874-bytes)) -(defun get-cp874-bytes(string pos end) +(defun get-cp874-bytes (string pos) (declare (optimize speed (safety 0)) (type simple-string string) - (type array-range pos end)) - (get-latin-bytes #'code->cp874-mapper :cp874 string pos end)) + (type array-range pos)) + (get-latin-bytes #'code->cp874-mapper :cp874 string pos)) (defun string->cp874 (string sstart send null-padding) (declare (optimize speed (safety 0)) @@ -2430,10 +2404,6 @@ (instantiate-octets-definition define-cp874->string) -(push '((:cp874 :|cp874|) - cp874->string-aref string->cp874) - *external-format-functions*) - (define-external-format (:cp874 :|cp874|) 1 t (let ((cp874-byte (code->cp874-mapper bits))) @@ -2443,4 +2413,6 @@ (let ((code (cp874->code-mapper byte))) (if code (code-char code) - (external-format-decoding-error stream byte)))) ;; TODO -- error check + (external-format-decoding-error stream byte))) + cp874->string-aref + string->cp874) ;; TODO -- error check