projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.32.12: Fix slot-value on specialized parameters in SVUC methods
[sbcl.git]
/
src
/
code
/
external-formats
/
enc-win.lisp
diff --git
a/src/code/external-formats/enc-win.lisp
b/src/code/external-formats/enc-win.lisp
index
3053734
..
82e293a
100644
(file)
--- a/
src/code/external-formats/enc-win.lisp
+++ b/
src/code/external-formats/enc-win.lisp
@@
-1,4
+1,4
@@
-(in-package #:sb!impl)
+(in-package "SB!IMPL")
(define-unibyte-mapper cp1250->code-mapper code->cp1250-mapper
(#x80 #x20AC) ; EURO SIGN
(define-unibyte-mapper cp1250->code-mapper code->cp1250-mapper
(#x80 #x20AC) ; EURO SIGN
@@
-83,11
+83,11
@@
)
(declaim (inline get-cp1250-bytes))
)
(declaim (inline get-cp1250-bytes))
-(defun get-cp1250-bytes(string pos end)
+(defun get-cp1250-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1250-mapper :cp1250 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1250-mapper :cp1250 string pos))
(defun string->cp1250 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1250 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-111,20
+111,18
@@
(instantiate-octets-definition define-cp1250->string)
(instantiate-octets-definition define-cp1250->string)
-(push '((:cp1250 :|cp1250| :windows-1250 :|windows-1250|)
- cp1250->string-aref string->cp1250)
- *external-format-functions*)
-
(define-external-format (:cp1250 :|cp1250| :windows-1250 :|windows-1250|)
1 t
(let ((cp1250-byte (code->cp1250-mapper bits)))
(if cp1250-byte
(setf (sap-ref-8 sap tail) cp1250-byte)
(define-external-format (:cp1250 :|cp1250| :windows-1250 :|windows-1250|)
1 t
(let ((cp1250-byte (code->cp1250-mapper bits)))
(if cp1250-byte
(setf (sap-ref-8 sap tail) cp1250-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1250->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1250->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1250->string-aref
+ string->cp1250) ;; TODO -- error check
(define-unibyte-mapper cp1251->code-mapper code->cp1251-mapper
(#x80 #x0402) ; CYRILLIC CAPITAL LETTER DJE
(define-unibyte-mapper cp1251->code-mapper code->cp1251-mapper
(#x80 #x0402) ; CYRILLIC CAPITAL LETTER DJE
@@
-243,11
+241,11
@@
)
(declaim (inline get-cp1251-bytes))
)
(declaim (inline get-cp1251-bytes))
-(defun get-cp1251-bytes(string pos end)
+(defun get-cp1251-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1251-mapper :cp1251 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1251-mapper :cp1251 string pos))
(defun string->cp1251 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1251 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-271,20
+269,18
@@
(instantiate-octets-definition define-cp1251->string)
(instantiate-octets-definition define-cp1251->string)
-(push '((:cp1251 :|cp1251| :windows-1251 :|windows-1251|)
- cp1251->string-aref string->cp1251)
- *external-format-functions*)
-
(define-external-format (:cp1251 :|cp1251| :windows-1251 :|windows-1251|)
1 t
(let ((cp1251-byte (code->cp1251-mapper bits)))
(if cp1251-byte
(setf (sap-ref-8 sap tail) cp1251-byte)
(define-external-format (:cp1251 :|cp1251| :windows-1251 :|windows-1251|)
1 t
(let ((cp1251-byte (code->cp1251-mapper bits)))
(if cp1251-byte
(setf (sap-ref-8 sap tail) cp1251-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1251->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1251->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1251->string-aref
+ string->cp1251) ;; TODO -- error check
(define-unibyte-mapper cp1252->code-mapper code->cp1252-mapper
(#x80 #x20AC) ; EURO SIGN
(define-unibyte-mapper cp1252->code-mapper code->cp1252-mapper
(#x80 #x20AC) ; EURO SIGN
@@
-322,11
+318,11
@@
)
(declaim (inline get-cp1252-bytes))
)
(declaim (inline get-cp1252-bytes))
-(defun get-cp1252-bytes(string pos end)
+(defun get-cp1252-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1252-mapper :cp1252 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1252-mapper :cp1252 string pos))
(defun string->cp1252 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1252 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-350,20
+346,18
@@
(instantiate-octets-definition define-cp1252->string)
(instantiate-octets-definition define-cp1252->string)
-(push '((:cp1252 :|cp1252| :windows-1252 :|windows-1252|)
- cp1252->string-aref string->cp1252)
- *external-format-functions*)
-
(define-external-format (:cp1252 :|cp1252| :windows-1252 :|windows-1252|)
1 t
(let ((cp1252-byte (code->cp1252-mapper bits)))
(if cp1252-byte
(setf (sap-ref-8 sap tail) cp1252-byte)
(define-external-format (:cp1252 :|cp1252| :windows-1252 :|windows-1252|)
1 t
(let ((cp1252-byte (code->cp1252-mapper bits)))
(if cp1252-byte
(setf (sap-ref-8 sap tail) cp1252-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1252->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1252->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1252->string-aref
+ string->cp1252) ;; TODO -- error check
(define-unibyte-mapper cp1253->code-mapper code->cp1253-mapper
(#x80 #x20AC) ; EURO SIGN
(define-unibyte-mapper cp1253->code-mapper code->cp1253-mapper
(#x80 #x20AC) ; EURO SIGN
@@
-476,11
+470,11
@@
)
(declaim (inline get-cp1253-bytes))
)
(declaim (inline get-cp1253-bytes))
-(defun get-cp1253-bytes(string pos end)
+(defun get-cp1253-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1253-mapper :cp1253 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1253-mapper :cp1253 string pos))
(defun string->cp1253 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1253 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-504,20
+498,18
@@
(instantiate-octets-definition define-cp1253->string)
(instantiate-octets-definition define-cp1253->string)
-(push '((:cp1253 :|cp1253| :windows-1253 :|windows-1253|)
- cp1253->string-aref string->cp1253)
- *external-format-functions*)
-
(define-external-format (:cp1253 :|cp1253| :windows-1253 :|windows-1253|)
1 t
(let ((cp1253-byte (code->cp1253-mapper bits)))
(if cp1253-byte
(setf (sap-ref-8 sap tail) cp1253-byte)
(define-external-format (:cp1253 :|cp1253| :windows-1253 :|windows-1253|)
1 t
(let ((cp1253-byte (code->cp1253-mapper bits)))
(if cp1253-byte
(setf (sap-ref-8 sap tail) cp1253-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1253->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1253->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1253->string-aref
+ string->cp1253) ;; TODO -- error check
(define-unibyte-mapper cp1254->code-mapper code->cp1254-mapper
(#x80 #x20AC) ; EURO SIGN
(define-unibyte-mapper cp1254->code-mapper code->cp1254-mapper
(#x80 #x20AC) ; EURO SIGN
@@
-561,11
+553,11
@@
)
(declaim (inline get-cp1254-bytes))
)
(declaim (inline get-cp1254-bytes))
-(defun get-cp1254-bytes(string pos end)
+(defun get-cp1254-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1254-mapper :cp1254 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1254-mapper :cp1254 string pos))
(defun string->cp1254 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1254 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-589,20
+581,18
@@
(instantiate-octets-definition define-cp1254->string)
(instantiate-octets-definition define-cp1254->string)
-(push '((:cp1254 :|cp1254| :windows-1254 :|windows-1254|)
- cp1254->string-aref string->cp1254)
- *external-format-functions*)
-
(define-external-format (:cp1254 :|cp1254|)
1 t
(let ((cp1254-byte (code->cp1254-mapper bits)))
(if cp1254-byte
(setf (sap-ref-8 sap tail) cp1254-byte)
(define-external-format (:cp1254 :|cp1254|)
1 t
(let ((cp1254-byte (code->cp1254-mapper bits)))
(if cp1254-byte
(setf (sap-ref-8 sap tail) cp1254-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1254->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1254->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1254->string-aref
+ string->cp1254) ;; TODO -- error check
(define-unibyte-mapper cp1255->code-mapper code->cp1255-mapper
(#x80 #x20AC) ; EURO SIGN
(define-unibyte-mapper cp1255->code-mapper code->cp1255-mapper
(#x80 #x20AC) ; EURO SIGN
@@
-707,11
+697,11
@@
)
(declaim (inline get-cp1255-bytes))
)
(declaim (inline get-cp1255-bytes))
-(defun get-cp1255-bytes(string pos end)
+(defun get-cp1255-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1255-mapper :cp1255 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1255-mapper :cp1255 string pos))
(defun string->cp1255 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1255 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-735,20
+725,18
@@
(instantiate-octets-definition define-cp1255->string)
(instantiate-octets-definition define-cp1255->string)
-(push '((:cp1255 :|cp1255| :windows-1255 :|windows-1255|)
- cp1255->string-aref string->cp1255)
- *external-format-functions*)
-
(define-external-format (:cp1255 :|cp1255| :windows-1255 :|windows-1255|)
1 t
(let ((cp1255-byte (code->cp1255-mapper bits)))
(if cp1255-byte
(setf (sap-ref-8 sap tail) cp1255-byte)
(define-external-format (:cp1255 :|cp1255| :windows-1255 :|windows-1255|)
1 t
(let ((cp1255-byte (code->cp1255-mapper bits)))
(if cp1255-byte
(setf (sap-ref-8 sap tail) cp1255-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1255->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1255->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1255->string-aref
+ string->cp1255) ;; TODO -- error check
(define-unibyte-mapper cp1256->code-mapper code->cp1256-mapper
(#x80 #x20AC) ; EURO SIGN
(define-unibyte-mapper cp1256->code-mapper code->cp1256-mapper
(#x80 #x20AC) ; EURO SIGN
@@
-839,11
+827,11
@@
)
(declaim (inline get-cp1256-bytes))
)
(declaim (inline get-cp1256-bytes))
-(defun get-cp1256-bytes(string pos end)
+(defun get-cp1256-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1256-mapper :cp1256 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1256-mapper :cp1256 string pos))
(defun string->cp1256 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1256 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-867,20
+855,18
@@
(instantiate-octets-definition define-cp1256->string)
(instantiate-octets-definition define-cp1256->string)
-(push '((:cp1256 :|cp1256| :windows-1256 :|windows-1256|)
- cp1256->string-aref string->cp1256)
- *external-format-functions*)
-
-(define-external-format (:cp1256 :|cp1256|)
+(define-external-format (:cp1256 :|cp1256| :windows-1256 :|windows-1256|)
1 t
(let ((cp1256-byte (code->cp1256-mapper bits)))
(if cp1256-byte
(setf (sap-ref-8 sap tail) cp1256-byte)
1 t
(let ((cp1256-byte (code->cp1256-mapper bits)))
(if cp1256-byte
(setf (sap-ref-8 sap tail) cp1256-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1256->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1256->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1256->string-aref
+ string->cp1256) ;; TODO -- error check
(define-unibyte-mapper cp1257->code-mapper code->cp1257-mapper
(#x80 #x20AC) ; EURO SIGN
(define-unibyte-mapper cp1257->code-mapper code->cp1257-mapper
(#x80 #x20AC) ; EURO SIGN
@@
-973,11
+959,11
@@
)
(declaim (inline get-cp1257-bytes))
)
(declaim (inline get-cp1257-bytes))
-(defun get-cp1257-bytes(string pos end)
+(defun get-cp1257-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1257-mapper :cp1257 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1257-mapper :cp1257 string pos))
(defun string->cp1257 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1257 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-1001,20
+987,18
@@
(instantiate-octets-definition define-cp1257->string)
(instantiate-octets-definition define-cp1257->string)
-(push '((:cp1257 :|cp1257| :windows-1257 :|windows-1257|)
- cp1257->string-aref string->cp1257)
- *external-format-functions*)
-
(define-external-format (:cp1257 :|cp1257| :windows-1257 :|windows-1257|)
1 t
(let ((cp1257-byte (code->cp1257-mapper bits)))
(if cp1257-byte
(setf (sap-ref-8 sap tail) cp1257-byte)
(define-external-format (:cp1257 :|cp1257| :windows-1257 :|windows-1257|)
1 t
(let ((cp1257-byte (code->cp1257-mapper bits)))
(if cp1257-byte
(setf (sap-ref-8 sap tail) cp1257-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1257->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1257->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1257->string-aref
+ string->cp1257) ;; TODO -- error check
(define-unibyte-mapper cp1258->code-mapper code->cp1258-mapper
(#x80 #x20AC) ; EURO SIGN
(define-unibyte-mapper cp1258->code-mapper code->cp1258-mapper
(#x80 #x20AC) ; EURO SIGN
@@
-1066,11
+1050,11
@@
)
(declaim (inline get-cp1258-bytes))
)
(declaim (inline get-cp1258-bytes))
-(defun get-cp1258-bytes(string pos end)
+(defun get-cp1258-bytes (string pos)
(declare (optimize speed (safety 0))
(type simple-string string)
(declare (optimize speed (safety 0))
(type simple-string string)
- (type array-range pos end))
- (get-latin-bytes #'code->cp1258-mapper :cp1258 string pos end))
+ (type array-range pos))
+ (get-latin-bytes #'code->cp1258-mapper :cp1258 string pos))
(defun string->cp1258 (string sstart send null-padding)
(declare (optimize speed (safety 0))
(defun string->cp1258 (string sstart send null-padding)
(declare (optimize speed (safety 0))
@@
-1094,17
+1078,16
@@
(instantiate-octets-definition define-cp1258->string)
(instantiate-octets-definition define-cp1258->string)
-(push '((:cp1258 :|cp1258| :windows-1258 :|windows-1258|)
- cp1258->string-aref string->cp1258)
- *external-format-functions*)
-
(define-external-format (:cp1258 :|cp1258| :windows-1258 :|windows-1258|)
1 t
(let ((cp1258-byte (code->cp1258-mapper bits)))
(if cp1258-byte
(setf (sap-ref-8 sap tail) cp1258-byte)
(define-external-format (:cp1258 :|cp1258| :windows-1258 :|windows-1258|)
1 t
(let ((cp1258-byte (code->cp1258-mapper bits)))
(if cp1258-byte
(setf (sap-ref-8 sap tail) cp1258-byte)
- (stream-encoding-error-and-handle stream bits)))
+ (external-format-encoding-error stream bits)))
(let ((code (cp1258->code-mapper byte)))
(if code
(code-char code)
(let ((code (cp1258->code-mapper byte)))
(if code
(code-char code)
- (stream-decoding-error stream byte)))) ;; TODO -- error check
+ (external-format-decoding-error stream byte)))
+ cp1258->string-aref
+ string->cp1258) ;; TODO -- error check
+