From 89038c86ea32efe9a0b5ed22e6c715453a8fca5d Mon Sep 17 00:00:00 2001
From: t-sin <shinichi.tanaka45@gmail.com>
Date: Sat, 14 Oct 2017 00:21:43 +0900
Subject: [PATCH 1/5] Changes name-mapping structure

---
 src/names.lisp | 492 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 338 insertions(+), 154 deletions(-)

diff --git a/src/names.lisp b/src/names.lisp
index 9c77c34..dc57480 100644
--- a/src/names.lisp
+++ b/src/names.lisp
@@ -11,270 +11,454 @@
 
 
 (defvar +name-mapping+
-  `(;;; unicode
-    ((:utf-8 . :unicode) .
+  `(
+
+;;; Unicode character set
+
+    (:name :utf-8
+     :type :unicode
+     :impl-name
+     #+sbcl :utf-8
+     #+ccl :utf-8
      #+clisp ,charset:utf-8
-     #+allegro :utf8
-     #-(or clisp allegro) :utf-8)
-    ((:ucs-2le . :unicode) .
+     #+ecl :utf-8
+     #+abcl :utf-8
+     #+lispworks :utf-8
+     #+allegro :utf8)
+
+    ;; TODO: UCS-2 == UTF16? strictly?
+    (:name :ucs-2le
+     :type :unicode
+     :impl-name
+     #+sbcl :utf-16le
+     #+ccl :utf-16le
      #+clisp ,charset:unicode-16-little-endian
-     #+allegro :cannot-treat
+     #+ecl :utf-16le
+     #+abcl :utf-16le
      #+lispworks '(unicode :little-endian)
-     #-(or clisp allegro lispworks) :utf-16le)
-    ((:ucs-2be . :unicode) .
+     #+allegro :cannot-treat)
+
+    (:name :ucs-2be
+     :type :unicode
+     :impl-name
+     #+sbcl :utf-16be
+     #+ccl :utf-16be
      #+clisp ,charset:unicode-16-big-endian
-     #+allegro :cannot-treat
+     #+ecl :utf-16be
+     #+abcl :utf-16be
      #+lispworks '(unicode :big-endian)
-     #-(or clisp allegro lispworks) :utf-16be)
-    ((:utf-16 . :unicode) .
+     #+allegro :cannot-treat)
+
+    (:name :utf-16
+     :type :unicode
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :utf-16
      #+clisp ,charset:utf-16
      #+ecl :utf-16
-     #+ccl :utf-16
      #+abcl :utf-16
-     #-(or clisp ecl ccl abcl) :cannot-treat)
+     #+lispworks :cannot-treat
+     #+allegro :cannot-treat)
 
-    ;;; japanese
-    ((:iso-2022-jp . :jp) .  ; jis
-     ;; #+lispworks :jis
+;;; Japanese
+
+    (:name :iso-2022-jp
+     :type :jp
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :cannot-treat
      #+clisp ,charset:iso-2022-jp
      #+ecl :cannot-treat
      #+abcl :iso-2022-jp
-     #+allegro :jis
      #+lispworks :jis
-     #-(or clisp ecl abcl allegro lispworks) :cannot-treat)
-    ((:euc-jp . :jp) .
-     ;; #+lispworks :euc-jp
+     #+allegro :jis)
+
+    (:name :euc-jp
+     :type :jp
+     :impl-name
+     #+sbcl :euc-jp
+     #+ccl :euc-jp
      #+clisp ,charset:euc-jp
      #+ecl :cannot-treat
-     #+allegro :euc
+     #+abcl :euc-jp
      #+lispworks :euc-jp
-     #-(or clisp ecl allegro lispworks) :euc-jp)
-    ((:cp932 . :jp) .
-     ;; #+lispworks :sjis
-     #+clisp ,charset:cp932
-     #+ecl :windows-cp932
+     #+allegro :euc)
+
+    (:name :cp932
+     :type :jp
+     :impl-name
      #+sbcl :shift_jis
      #+ccl :windows-31j
+     #+clisp ,charset:cp932
+     #+ecl :windows-cp932
      #+abcl :|x-MS932_0213|
-     #+allegro :shiftjis
-     #+lispworks :sjis)
+     #+lispworks :sjis
+     #+allegro :shiftjis)
 
-    ;;; taiwanese
-    ((:big5 . :tw) .
+;;; Taiwanese
+
+    (:name :big5
+     :type :tw
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :cannot-treat
      #+clisp ,charset:big5
      #+ecl :windows-cp950
      #+abcl :|Big5|
-     #+allegro :big5
-     #-(or clisp ecl abcl allegro) :cannot-treat)
-    ((:iso-2022-tw :tw) .
+     #+lispworks :cannot-treat
+     #+allegro :big5)
+
+    (:name :iso-2022-tw
+     :type :tw
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :cannot-treat
      #+clisp ,charset:euc-tw
+     #+ecl :cannot-treat
      #+abcl :|x-EUC-TW|
-     #-(or clisp abcl) :cannot-treat)
+     #+lispworks :cannot-treat
+     #+allegro :cannot-treat)
 
-    ;;; chinese
-    ((:gb2312 . :cn) .
-     #+clisp ,charset:gbk
-     #+ecl :windows-cp936
+;;; Chinese
+
+    (:name :gb2312
+     :type :cn
+     :impl-name
      #+sbcl :gbk
      #+ccl :cp936
+     #+clisp ,charset:gbk
+     #+ecl :windows-cp936
      #+abcl :gbk
-     #+allegro :cannot-treat
-     #+lispworks :gbk)
-    ((:gb18030 . :cn) .
+     #+lispworks :gbk
+     #+allegro :cannot-treat)
+
+    (:name :gb18030
+     :type :cn
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :cannot-treat
      #+clisp ,charset:gb18030
+     #+ecl :cannot-treat
      #+abcl :gb18030
-     #+allegro :gb18030
-     #-(or clisp abcl allegro) :cannot-treat)
-    ((:iso-2022-cn . :cn) .
+     #+lispworks :cannot-treat
+     #+allegro :gb18030)
+
+    (:name :iso-2022-cn
+     :type :cn
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :cannot-treat
      #+clisp ,charset:iso-2022-cn
+     #+ecl :cannot-treat
      #+abcl :iso-2022-cn
-     #-(or clisp abcl) :cannot-treat)
+     #+lispworks :cannot-treat
+     #+allegro :cannot-treat)
 
-    ;;; korean
-    ((:euc-kr . :kr) .
+;;; Korean
+
+    (:name :euc-kr
+     :type :kr
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :cannot-treat
      #+clisp ,charset:euc-kr
      #+ecl :windows-cp949
-     #+allegro :949
-     #+(and lispworks windows) '(win32:code-page :id 949)
-     #+(or sbcl ccl) :cannot-treat
-     #-(or clisp ecl sbcl ccl allegro) :euc-kr)
-    ((:johab . :kr) .
+     #+abcl :euc-kr
+     #+lispworks '(win32:code-page :id 949)
+     #+allegro :949)
+
+    (:name :johab
+     :type :kr
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :cannot-treat
      #+clisp ,charset:johab
+     #+ecl :cannot-treat
      #+abcl :|x-Johab|
-     #+(or ecl sbcl ccl allegro lispworks) :cannot-treat
-     #-(or clisp ecl sbcl ccl abcl allegro) :johab)
-    ((:iso-2022-kr . :kr) .
+     #+lispworks :cannot-treat
+     #+allegro :cannot-treat)
+
+    (:name :iso-2022-kr
+     :type :kr
+     :impl-name
+     #+sbcl :cannot-treat
+     #+ccl :cannot-treat
      #+clisp ,charset:iso-2022-kr
+     #+ecl :cannot-treat
      #+abcl :iso-2022-kr
-     #-(or clisp abcl) :cannot-treat)
+     #+lispworks :cannot-treat
+     #+allegro :cannot-treat)
 
-    ;;; arabic
-    ((:iso-8859-6 . :ar) .
+;;; Arabic
+
+    (:name :iso-8859-6
+     :type :ar
+     :impl-name
+     #+sbcl :iso-8859-6
+     #+ccl :iso-8859-6
      #+clisp ,charset:iso-8859-6
-     #+allegro :iso8859-6
+     #+ecl :iso-8859-6
+     #+abcl :iso-8859-6
      #+lispworks :cannot-treat
-     #-(or clisp allegro lispworks) :iso-8859-6)
-    ((:cp1256 . :ar) .
+     #+allegro :iso8859-6)
+
+    (:name :cp1256
+     :type :ar
+     :impl-name
+     #+sbcl :cp1256
+     #+ccl :cannot-treat
      #+clisp ,charset:cp1256
      #+ecl :windows-cp1256
-     #+ccl :cannot-treat
      #+abcl :|windows-1256|
-     #+allegro :1256
-     #+(and lispworks windows) '(win32:code-page :id 1256)
-     #-(or clisp ecl ccl abcl allegro lispworks) :cp1256)
+     #+lispworks '(win32:code-page :id 1256)
+     #+allegro :1256)
+
+;;; Greek
 
-    ;;; greek
-    ((:iso-8859-7 . :gr) .
+    (:name :iso-8859-7
+     :type :gr
+     :impl-name
+     #+sbcl :iso-8859-7
+     #+ccl :iso-8859-7
      #+clisp ,charset:iso-8859-7
-     #+allegro :iso8859-7
+     #+ecl :iso-8859-7
+     #+abcl :iso-8859-7
      #+lispworks :cannot-treat
-     #-(or clisp allegro lispworks) :iso-8859-7)
-    ((:cp1253 . :gr) .
+     #+allegro :iso8859-7)
+
+    (:name :cp1253
+     :type :gr
+     :impl-name
+     #+sbcl :cp1253
+     #+ccl :cannot-treat
      #+clisp ,charset:cp1253
      #+ecl :windows-cp1253
-     #+ccl :cannot-treat
-     #+abcl  :|windows-1253|
-     #+allegro :1253
-     #+(and lispworks windows) '(win32:code-page :id 1253)
-     #-(or clisp ecl ccl abcl allegro lispworks) :cp1253)
-
-    ;;; hebrew
-    ((:iso-8859-8 . :hw) .
-     #+clisp ,charset:iso-8859-8
-     #+allegro :iso8559-8
+     #+abcl :|windows-1253|
+     #+lispworks '(win32:code-page :id 1253)
+     #+allegro :1253)
+
+;;; Hebrew
+
+    (:name :iso-8859-8
+     :type :hw
+     :impl-name
+     #+sbcl :iso-8859-8
+     #+ccl :iso-8859-8
+     #+clisp :iso-8859-8
+     #+ecl :iso-8859-8
+     #+abcl :iso-8859-8
      #+lispworks :cannot-treat
-     #-(or clisp allegro lispworks) :iso-8859-8)
-    ((:cp1255 . :hw) .
+     #+allegro :iso8559-8)
+
+    (:name :cp1255
+     :type :hw
+     :impl-name
+     #+sbcl :cp1255
+     #+ccl :cannot-treat
      #+clisp ,charset:cp1255
      #+ecl :windows-cp1255
-     #+ccl :cannot-treat
      #+abcl :|windows-1255|
-     #+allegro :1255
-     #+(and lispworks windows) '(win32:code-page :id 1255)
-     #-(or clisp ecl ccl abcl allegro lispworks) :cp1255)
+     #+lispworks '(win32:code-page :id 1255)
+     #+allegro :1255)
+
+;;; Turkish
 
-    ;;; turkish
-    ((:iso-8859-9 . :tr) .
+    (:name :iso-8859-9
+     :type :tr
+     :impl-name
+     #+sbcl :iso-8859-9
+     #+ccl :iso-8859-9
      #+clisp ,charset:iso-8859-9
-     #+allegro :iso8859-9
+     #+ecl :iso-8859-9
+     #+abcl :iso-8859-9
      #+lispworks :cannot-treat
-     #-(or clisp allegro lispworks) :iso-8859-9)
-    ((:cp1254 . :tr) .
+     #+allegro :iso8859-9)
+
+    (:name :cp1254
+     :type :tr
+     :impl-name
+     #+sbcl :cp1254
+     #+ccl :cannot-treat
      #+clisp ,charset:cp1254
      #+ecl :windows-cp1254
-     #+ccl :cannot-treat
      #+abcl :|windows-1254|
-     #+allegro :1254
-     #+(and lispworks windows) '(win32:code-page :id 1254)
-     #-(or clisp ecl ccl abcl allegro lispworks) :cp1254)
+     #+lispworks '(win32:code-page :id 1254)
+     #+allegro :1254)
+
+;;; Russian
 
-    ;;; russian
-    ((:iso-8859-5 . :ru) .
+    (:name :iso-8859-5
+     :type :ru
+     :impl-name
+     #+sbcl :iso-8859-5
+     #+ccl :iso-8859-5
      #+clisp ,charset:iso-8859-5
-     #+allegro :iso8859-5
+     #+ecl :iso-8859-5
+     #+abcl :iso-8859-5
      #+lispworks :cannot-treat
-     #-(or clisp allegro lispworks) :iso-8859-5)
-    ((:koi8-r . :ru) .
-     #+clisp ,charset:koi8-r
+     #+allegro :iso8859-5)
+
+    (:name :koi8-r
+     :type :ru
+     :impl-name
      #+sbcl :koi8-r
-     #+(or ecl ccl lispworks) :cannot-treat
-     #-(or clisp sbcl ecl ccl) :koi8-r)
-    ((:koi8-u . :ru) .
+     #+ccl :cannot-treat
+     #+clisp ,charset:koi8-r
+     #+ecl :cannot-treat
+     #+abcl :koi8-r
+     #+lispworks :cannot-treat
+     #+allegro :koi8-r)
+
+    (:name :koi8-u
+     :type :ru
+     :impl-name
+     #+sbcl :koi8-u
+     #+ccl :cannot-treat
      #+clisp ,charset:koi8-u
-     #+(or ecl ccl allegro lispworks) :cannot-treat
-     #-(or clisp ecl ccl allegro lispworks) :koi8-u)
-    ((:cp866 . :ru) .
+     #+ecl :cannot-treat
+     #+abcl :koi8-u
+     #+lispworks :cannot-treat
+     #+allegro :cannot-treat)
+
+    (:name :cp866
+     :type :ru
+     :impl-name
+     #+sbcl :cp866
+     #+ccl :cannot-treat
      #+clisp ,charset:cp866
      #+ecl :dos-cp866
-     #+ccl :cannot-treat
      #+abcl :ibm866
-     #+allegro :cannot-treat
      #+lispworks :cannot-treat
-     #-(or clisp ecl ccl abcl lispworks) :cp866)
-    ((:cp1251 . :ru) .
+     #+allegro :cannot-treat)
+
+    (:name :cp1251
+     :type :ru
+     :impl-name
+     #+sbcl :cp1251
+     #+ccl :cannot-treat
      #+clisp ,charset:cp1251
      #+ecl :windows-cp1251
-     #+ccl :cannot-treat
      #+abcl :|windows-1251|
-     #+allegro :1251
-     #+(and lispworks windows) '(win32:code-page :id 1251)
-     #-(or clisp ecl ccl abcl allegro lispworks) :cp1251)
+     #+lispworks '(win32:code-page :id 1251)
+     #+allegro :1251)
+
+;;; Polish
 
-    ;;; polish
-    ((:iso-8859-2 . :pl) .
+    (:name :iso-8859-2
+     :type :pl
+     :impl-name
+     #+sbcl :iso-8859-2
+     #+ccl :iso-8859-2
      #+clisp ,charset:iso-8859-2
-     #+allegro :iso8859-2
+     #+ecl :iso-8859-2
+     #+abcl :iso-8859-2
      #+lispworks :cannot-treat
-     #-(or clisp allegro lispworks) :iso-8859-2)
-    ((:cp1250 . :pl) .
+     #+allegro :iso8859-2)
+
+    (:name :cp1250
+     :type :pl
+     :impl-name
+     #+sbcl :cp1250
+     #+ccl :cannot-treat
      #+clisp ,charset:cp1250
      #+ecl :windows-cp1250
-     #+ccl :cannot-treat
      #+abcl :|windows-1250|
-     #+allegro :1250
-     #+(and lispworks windows) '(win32:code-page :id 1250)
-     #-(or clisp ecl ccl abcl allegro lispworks) :cp1250)
+     #+lispworks '(win32:code-page :id 1250)
+     #+allegro :1250)
 
-    ;;; baltic
-    ((:iso-8859-13 . :bl) .
+;;; Baltic
+
+    (:name :iso-8859-13
+     :type :bl
+     :impl-name
+     #+sbcl :iso-8859-13
+     #+ccl :iso-8859-13
      #+clisp ,charset:iso-8859-13
-     #+allegro :cannot-treat
+     #+ecl :iso-8859-13
+     #+abcl :iso-8859-13
      #+lispworks :cannot-treat
-     #-(or clisp allegro lispworks) :iso-8859-13)
-    ((:cp1257 . :bl) .
+     #+allegro :cannot-treat)
+
+    (:name :cp1257
+     :type :bl
+     :impl-name
+     #+sbcl :cp1257
+     #+ccl :cannot-treat
      #+clisp ,charset:cp1257
      #+ecl :windows-cp1257
-     #+ccl :cannot-treat
      #+abcl :|windows-1257|
-     #+allegro :1257
-     #+(and lispworks windows) '(win32:code-page :id 1257)
-     #-(or clisp ecl ccl abcl allegro lispworks) :cp1257)
+     #+lispworks '(win32:code-page :id 1257)
+     #+allegro :1257)
 
-    ;;; end of line
-    ((:lf . :eol) .
-     #+clisp :unix
+;;; End of line markers
+
+    (:name :lf
+     :type :eol
+     :impl-name
      #+sbcl :cannot-treat
      #+ccl :unix
-     #+allegro :unix
+     #+clisp :unix
+     #+ecl :lf
+     #+abcl :lf
      #+lispworks :lf
-     #-(or clisp sbcl ccl allegro lispworks) :lf)
-    ((:cr . :eol) .
-     #+clisp :mac
+     #+allegro :unix)
+
+    (:name :cr
+     :type :eol
+     :impl-name
      #+sbcl :cannot-treat
      #+ccl :macos
-     #+allegro :mac
+     #+clisp :mac
+     #+ecl :cr
+     #+abcl :cr
      #+lispworks :cr
-     #-(or clisp sbcl ccl allegro lispworks) :cr)
-    ((:crlf . :eol) .
-     ;; #+lispworks :crlf
-     #+clisp :dos
+     #+allegro :mac)
+
+    (:name :crlf
+     :type :eol
+     :impl-name
      #+sbcl :cannot-treat
      #+ccl :dos
-     #+allegro :dos
+     #+clisp :dos
+     #+ecl :crlf
+     #+abcl :crlf
      #+lispworks :crlf
-     #-(or clisp sbcl ccl allegro lispworks) :crlf)))
+     #+allegro :dos)))
 
 (defvar +available-encodings+
   (loop
-     :for ((name . type) . impl-name) :in +name-mapping+
+     :for enc :in +name-mapping+
+     :for name := (getf enc :name)
+     :for type := (getf enc :type)
      :unless (eq type :eol)
      :collect name))
 
 (defvar +available-eols+
   (loop
-     :for ((name . type) . impl-name) :in +name-mapping+
+     :for enc :in +name-mapping+
+     :for name := (getf enc :name)
+     :for type := (getf enc :type)
      :when (eq type :eol)
      :collect name))
 
 (defun independent-name (dependent-name)
-  (caar (find-if (lambda (n) (eql dependent-name (cdr n))) +name-mapping+)))
+  (getf (find-if (lambda (enc)
+                   (let ((impl-name (getf enc :impl-name)))
+                     (and (not (eq impl-name :cannot-treat))
+                          (eq impl-name dependent-name))))
+                 +name-mapping+)
+        :name))
 
 (defun dependent-name (independent-name)
-  (cdr (find-if (lambda (n) (eql independent-name (caar n))) +name-mapping+)))
+  (getf (find-if (lambda (enc) (eq (getf enc :name) independent-name))
+                 +name-mapping+)
+        :impl-name))
 
-(defun unicode-p (encoding)
-  (member encoding
+(defun unicode-p (independent-name)
+  (member independent-name
           (loop
-             :for ((name . type) . impl-name) :in +name-mapping+
+             :for enc :in +name-mapping+
+             :for name := (getf enc :name)
+             :for type := (getf enc :type)
              :when (eq type :unicode)
              :collect name)))

From 710625fcf3baa0e2842b97ee82ee0bfd93b2ae2d Mon Sep 17 00:00:00 2001
From: t-sin <shinichi.tanaka45@gmail.com>
Date: Sun, 22 Oct 2017 13:24:55 +0900
Subject: [PATCH 2/5] Refines name tests

---
 t/names.lisp | 632 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 352 insertions(+), 280 deletions(-)

diff --git a/t/names.lisp b/t/names.lisp
index cd4b16c..e3a7964 100644
--- a/t/names.lisp
+++ b/t/names.lisp
@@ -60,310 +60,382 @@
 (defvar +cannot-treat+ :cannot-treat)
 
 (subtest "unicode"
-  (is (dependent-name :utf-8)
-      #+clisp charset:utf-8
-      #+ecl :utf-8
-      #+sbcl :utf-8
-      #+ccl :utf-8
-      #+abcl :utf-8
-      #+allegro :utf8
-      #+lispworks :utf-8)
-  (is (dependent-name :ucs-2le)
-      #+clisp charset:unicode-16-little-endian  ;; = ucs-2 = unicode-16
-      #+ecl :utf-16le  ;; = :ucs-2le
-      #+sbcl :utf-16le
-      #+ccl :utf-16le
-      #+abcl :utf-16le
-      #+allegro +cannot-treat+
-      #+lispworks '(:unicode :little-endian))
-  (is (dependent-name :ucs-2be)
-      #+clisp charset:unicode-16-big-endian
-      #+ecl :utf-16be  ;; = :ucs-2be
-      #+sbcl :utf-16be
-      #+ccl :utf-16be
-      #+abcl :utf-16be
-      #+allegro +cannot-treat+
-      #+lispworks '(:unicode :big-endian))
-  (is (dependent-name :utf-16)
-      #+clisp charset:utf-16
-      #+ecl :utf-16  ;; = :ucs-2
-      #+sbcl +cannot-treat+
-      #+ccl :utf-16
-      #+abcl :utf-16
-      #+allegro +cannot-treat+
-      #+lispworks +cannot-treat+))
+  (let ((impl-enc #+sbcl :utf-8
+             #+ccl :utf-8
+             #+clisp charset:utf-8
+             #+ecl :utf-8
+             #+abcl :utf-8
+             #+allegro :utf8
+             #+lispworks :utf-8))
+    (is (dependent-name :utf-8) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :utf-8)))
+  (let ((impl-enc #+sbcl :utf-16le
+             #+ccl :utf-16le
+             #+clisp charset:unicode-16-little-endian
+             #+ecl :utf-16le
+             #+abcl :utf-16le
+             #+allegro +cannot-treat+
+             #+lispworks '(:unicode :little-endian)))
+    (is (dependent-name :ucs-2le) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :ucs-2le)))
+  (let ((impl-enc #+sbcl :utf-16be
+             #+ccl :utf-16be
+             #+clisp charset:unicode-16-big-endian
+             #+ecl :utf-16be
+             #+abcl :utf-16be
+             #+allegro +cannot-treat+
+             #+lispworks '(:unicode :big-endian)))
+    (is (dependent-name :ucs-2be) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :ucs-2be)))
+  (let ((impl-enc #+sbcl +cannot-treat+
+             #+ccl :utf-16
+             #+clisp charset:utf-16
+             #+ecl :utf-16
+             #+abcl :utf-16
+             #+allegro +cannot-treat+
+             #+lispworks +cannot-treat+))
+    (is (dependent-name :utf-16) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :utf-16))))
 
 (subtest "japanese"
- (is (dependent-name :iso-2022-jp)
-      #+clisp charset:iso-2022-jp
-      #+ecl +cannot-treat+
-      #+sbcl +cannot-treat+
-      #+ccl +cannot-treat+
-      #+abcl :iso-2022-jp
-      #+allegro :jis
-      #+lispworks :jis)
- (is (dependent-name :euc-jp)
-      #+clisp charset:euc-jp
-      #+ecl +cannot-treat+
-      #+sbcl :euc-jp
-      #+ccl :euc-jp
-      #+abcl :euc-jp
-      #+allegro :euc  ; I tried.
-      #+lispworks :euc-jp)
- (is (dependent-name :cp932)
-      #+clisp charset:cp932
-      #+ecl :windows-cp932
-      #+sbcl :shift_jis
-      #+ccl :windows-31j
-      #+abcl :|x-MS932_0213|
-      #+allegro :shiftjis
-      #+lispworks :sjis))
+  (let ((impl-enc #+sbcl +cannot-treat+
+             #+ccl +cannot-treat+
+             #+clisp charset:iso-2022-jp
+             #+ecl +cannot-treat+
+             #+abcl :iso-2022-jp
+             #+allegro :jis
+             #+lispworks :jis))
+    (is (dependent-name :iso-2022-jp) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :iso-2022-jp)))
+  (let ((impl-enc #+sbcl :euc-jp
+             #+ccl :euc-jp
+             #+clisp charset:euc-jp
+             #+ecl +cannot-treat+
+             #+abcl :euc-jp
+             #+allegro :euc
+             #+lispworks :euc-jp))
+    (is (dependent-name :euc-jp) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :euc-jp)))
+  (let ((impl-enc #+sbcl :shift_jis
+             #+ccl :windows-31j
+             #+clisp charset:cp932
+             #+ecl :windows-cp932
+             #+abcl :|x-MS932_0213|
+             #+allegro :shiftjis
+             #+lispworks :sjis))
+    (is (dependent-name :cp932) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :cp932))))
 
 (subtest "tiwanese"
- (is (dependent-name :big5)
-      #+clisp charset:big5
-      #+ecl :windows-cp950
-      #+sbcl +cannot-treat+
-      #+ccl +cannot-treat+
-      #+abcl :|Big5|
-      #+allegro :big5
-      #+(and lispworks windows) '(win32:code-page :id 950))
- (is (dependent-name :iso-2022-tw)
-      #+clisp charset:euc-tw
-      #+ecl +cannot-treat+
-      #+sbcl +cannot-treat+
-      #+ccl +cannot-treat+
-      #+abcl :|x-EUC-TW|
-      #+allegro +cannot-treat+
-      #+lispworks +cannot-treat+))
+  (let ((impl-enc #+sbcl +cannot-treat+
+                  #+ccl +cannot-treat+
+                  #+clisp charset:big5
+                  #+ecl :windows-cp950
+                  #+abcl :|Big5|
+                  #+allegro :big5
+                  #+(and lispworks windows) '(win32:code-page :id 950)))
+    (is (dependent-name :big5) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :big5)))
+   (let ((impl-enc #+clisp charset:euc-tw
+                   #+ecl +cannot-treat+
+                   #+sbcl +cannot-treat+
+                   #+ccl +cannot-treat+
+                   #+abcl :|x-EUC-TW|
+                   #+allegro +cannot-treat+
+                   #+lispworks +cannot-treat+))
+     (is (dependent-name :iso-2022-tw) impl-enc)
+     (unless impl-enc
+       (is (independent-name impl-enc) :iso-2022-tw))))
 
 (subtest "chinese"
- (is (dependent-name :gb2312)  ;; = EUC-CN, GBK, cp936
-      #+clisp charset:gbk
-      #+ecl :windows-cp936
-      #+sbcl :gbk
-      #+ccl :cp936
-      #+abcl :gbk
-      #+allegro +cannot-treat+
-      #+lispworks :gbk)
- (is (dependent-name :gb18030)
-      #+clisp charset:gb18030
-      #+ecl +cannot-treat+
-      #+sbcl +cannot-treat+
-      #+ccl +cannot-treat+
-      #+abcl :gb18030
-      #+allegro :gb18030
-      #+lispworks +cannot-treat+)
- (is (dependent-name :iso-2022-cn)
-      #+clisp charset:iso-2022-cn
-      #+ecl +cannot-treat+
-      #+sbcl +cannot-treat+
-      #+ccl +cannot-treat+
-      #+abcl :iso-2022-cn
-      #+allegro +cannot-treat+
-      #+lispworks +cannot-treat+))
+  ;; = EUC-CN, GBK, cp936
+  (let ((impl-enc #+sbcl :gbk
+                  #+ccl :cp936
+                  #+clisp charset:gbk
+                  #+ecl :windows-cp936
+                  #+abcl :gbk
+                  #+allegro +cannot-treat+
+                  #+lispworks :gbk))
+    (is (dependent-name :gb2312) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :gb2312)))
+  (let ((impl-enc #+sbcl +cannot-treat+
+                  #+ccl +cannot-treat+
+                  #+clisp charset:gb18030
+                  #+ecl +cannot-treat+
+                  #+abcl :gb18030
+                  #+allegro :gb18030
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :gb18030) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :gb18030)))
+  (let ((impl-enc #+sbcl +cannot-treat+
+                  #+ccl +cannot-treat+
+                  #+clisp charset:iso-2022-cn
+                  #+ecl +cannot-treat+
+                  #+abcl :iso-2022-cn
+                  #+allegro +cannot-treat+
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-2022-cn) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :iso-2022-cn))))
 
 (subtest "korean"
- (is (dependent-name :euc-kr)
-      #+clisp charset:euc-kr
-      #+ecl :windows-cp949
-      #+sbcl +cannot-treat+
-      #+ccl +cannot-treat+
-      #+abcl :euc-kr
-      #+allegro :949
-      #+(and lispworks windows) '(win32:code-page :id 949))
- (is (dependent-name :johab)
-      #+clisp charset:johab
-      #+ecl +cannot-treat+
-      #+sbcl +cannot-treat+
-      #+ccl +cannot-treat+
-      #+abcl :|x-Johab|
-      #+allegro +cannot-treat+
-      #+lispworks +cannot-treat+)
- (is (dependent-name :iso-2022-kr)
-      #+clisp charset:iso-2022-kr
-      #+ecl +cannot-treat+
-      #+sbcl +cannot-treat+
-      #+ccl +cannot-treat+
-      #+abcl :iso-2022-kr
-      #+allegro +cannot-treat+
-      #+lispworks +cannot-treat+))
+  (let ((impl-enc #+sbcl +cannot-treat+
+                  #+ccl +cannot-treat+
+                  #+clisp charset:euc-kr
+                  #+ecl :windows-cp949
+                  #+abcl :euc-kr
+                  #+allegro :949
+                  #+(and lispworks windows) '(win32:code-page :id 949)))
+    (is (dependent-name :euc-kr) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :euc-kr)))
+  (let ((impl-enc #+sbcl +cannot-treat+
+                  #+ccl +cannot-treat+
+                  #+clisp charset:johab
+                  #+ecl +cannot-treat+
+                  #+abcl :|x-Johab|
+                  #+allegro +cannot-treat+
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :johab) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :johab)))
+  (let ((impl-enc #+sbcl +cannot-treat+
+                  #+ccl +cannot-treat+
+                  #+clisp charset:iso-2022-kr
+                  #+ecl +cannot-treat+
+                  #+abcl :iso-2022-kr
+                  #+allegro +cannot-treat+
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-2022-kr) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc):iso-2022-kr))))
 
 (subtest "arabic"
- (is (dependent-name :iso-8859-6)
-      #+clisp charset:iso-8859-6
-      #+ecl :iso-8859-6
-      #+sbcl :iso-8859-6
-      #+ccl :iso-8859-6
-      #+abcl :iso-8859-6
-      #+allegro iso8859-6
-      #+lispworks +cannot-treat+)
- (is (dependent-name :cp1256)
-      #+clisp charset:windows-1256
-      #+ecl :windows-cp1256
-      #+sbcl :cp1256
-      #+ccl +cannot-treat+
-      #+abcl :|windows-1256|
-      #+allegro :1256
-      #+(and lispworks windows) '(win32:code-page :id 1256)))
+  (let ((impl-enc #+sbcl :iso-8859-6
+                  #+ccl :iso-8859-6
+                  #+clisp charset:iso-8859-6
+                  #+ecl :iso-8859-6
+                  #+abcl :iso-8859-6
+                  #+allegro iso8859-6
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-8859-6) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :iso-8859-6)))
+  (let ((impl-enc #+sbcl :cp1256
+                  #+ccl +cannot-treat+
+                  #+clisp charset:windows-1256
+                  #+ecl :windows-cp1256
+                  #+abcl :|windows-1256|
+                  #+allegro :1256
+                  #+(and lispworks windows) '(win32:code-page :id 1256)))
+    (is (dependent-name :cp1256) impl-enc)
+    (unless impl-enc
+      (is (dependent-name impl-enc) :cp1256))))
 
 (subtest "greek"
- (is (dependent-name :iso-8859-7)
-      #+clisp charset:iso-8859-7
-      #+ecl :iso-8859-7
-      #+sbcl :iso-8859-7
-      #+ccl :iso-8859-7
-      #+abcl :iso-8859-7
-      #+allegro :iso8859-7
-      #+lispworks +cannot-treat+)
- (is (dependent-name :cp1253)
-      #+clisp charset:windows-1253
-      #+ecl :windows-cp1253
-      #+sbcl :cp1253
-      #+ccl +cannot-treat+
-      #+abcl :|windows-1253|
-      #+allegro :1253
-      #+(and lispworks windows) '(win32:code-page :id 1253)))
+  (let ((impl-enc #+sbcl :iso-8859-7
+                  #+ccl :iso-8859-7
+                  #+clisp charset:iso-8859-7
+                  #+ecl :iso-8859-7
+                  #+abcl :iso-8859-7
+                  #+allegro :iso8859-7
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-8859-7) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :iso-8859-7)))
+  (let ((impl-enc #+sbcl :cp1253
+                  #+ccl +cannot-treat+
+                  #+clisp charset:windows-1253
+                  #+ecl :windows-cp1253
+                  #+abcl :|windows-1253|
+                  #+allegro :1253
+                  #+(and lispworks windows) '(win32:code-page :id 1253)))
+    (is (dependent-name :cp1253) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :cp1253))))
 
 (subtest "hebrew"
-  (is (dependent-name :iso-8859-8)
-      #+clisp charset:iso-8859-8
-      #+ecl :iso-8859-8
-      #+sbcl :iso-8859-8
-      #+ccl :iso-8859-8
-      #+abcl :iso-8859-8
-      #+allegro :iso8859-8
-      #+lispworks +cannot-treat+)
-  (is (dependent-name :cp1255)
-      #+clisp charset:windows-1255
-      #+ecl :windows-cp1255
-      #+sbcl :cp1255
-      #+ccl +cannot-treat+
-      #+abcl :|windows-1255|
-      #+allegro :1255
-      #+(and lispworks windows) '(win32:code-page :id 1255)))
+  (let ((impl-enc #+sbcl :iso-8859-8
+                  #+ccl :iso-8859-8
+                  #+clisp charset:iso-8859-8
+                  #+ecl :iso-8859-8
+                  #+abcl :iso-8859-8
+                  #+allegro :iso8859-8
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-8859-8) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :iso-8859-8)))
+  (let ((impl-enc #+sbcl :cp1255
+                  #+ccl +cannot-treat+
+                  #+clisp charset:windows-1255
+                  #+ecl :windows-cp1255
+                  #+abcl :|windows-1255|
+                  #+allegro :1255
+                  #+(and lispworks windows) '(win32:code-page :id 1255)))
+    (is (dependent-name :cp1255) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :cp1255))))
 
 (subtest "turkish"
-  (is (dependent-name :iso-8859-9)
-      #+clisp charset:iso-8859-9
-      #+ecl :iso-8859-9
-      #+sbcl :iso-8859-9
-      #+ccl :iso-8859-9
-      #+abcl :iso-8859-9
-      #+allegro :iso8859-9
-      #+lispworks +cannot-treat+)
-  (is (dependent-name :cp1254)
-      #+clisp charset:windows-1254
-      #+ecl :windows-cp1254
-      #+sbcl :cp1254
-      #+ccl +cannot-treat+
-      #+abcl :|windows-1254|
-      #+allegro :1254
-      #+(and lispworks windows) '(win32:code-page :id 1254)))
+  (let ((impl-enc #+sbcl :iso-8859-9
+                  #+ccl :iso-8859-9
+                  #+clisp charset:iso-8859-9
+                  #+ecl :iso-8859-9
+                  #+abcl :iso-8859-9
+                  #+allegro :iso8859-9
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-8859-9) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :iso-8859-9)))
+  (let ((impl-enc #+sbcl :cp1254
+                  #+ccl +cannot-treat+
+                  #+clisp charset:windows-1254
+                  #+ecl :windows-cp1254
+                  #+abcl :|windows-1254|
+                  #+allegro :1254
+                  #+(and lispworks windows) '(win32:code-page :id 1254)))
+    (is (dependent-name :cp1254) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :cp1254))))
 
 (subtest "russian"
-  (is (dependent-name :iso-8859-5)
-      #+clisp charset:iso-8859-5
-      #+ecl :iso-8859-5
-      #+sbcl :iso-8859-5
-      #+ccl :iso-8859-5
-      #+abcl :iso-8859-5
-      #+allegro :iso8859-5
-      #+lispworks +cannot-treat+)
-  (is (dependent-name :koi8-r)
-      #+clisp charset:koi8-r
-      #+ecl +cannot-treat+
-      #+sbcl :koi8-r
-      #+ccl +cannot-treat+
-      #+abcl :koi8-r
-      #+allegro :koi8-r
-      #+lispworks +cannot-treat+)
-  (is (dependent-name :koi8-u)
-      #+clisp charset:koi8-u
-      #+ecl +cannot-treat+
-      #+sbcl :koi8-u
-      #+ccl +cannot-treat+
-      #+abcl :koi8-u
-      #+allegro +cannot-treat+
-      #+lispworks +cannot-treat+)
-  (is (dependent-name :cp866)
-      #+clisp charset:cp866
-      #+ecl :dos-cp866
-      #+sbcl :cp866
-      #+ccl +cannot-treat+
-      #+abcl :ibm866
-      #+allegro +cannot-treat+
-      #+lispworks +cannot-treat+)
-  (is (dependent-name :cp1251)
-      #+clisp charset:windows-1251
-      #+ecl :windows-cp1251
-      #+sbcl :cp1251
-      #+ccl +cannot-treat+
-      #+abcl :|windows-1251|
-      #+allegro :1251
-      #+(and lispworks windows) '(win32:code-page :id 1251)))
+  (let ((impl-enc #+sbcl :iso-8859-5
+                  #+ccl :iso-8859-5
+                  #+clisp charset:iso-8859-5
+                  #+ecl :iso-8859-5
+                  #+abcl :iso-8859-5
+                  #+allegro :iso8859-5
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-8859-5) impl-enc)
+    (unless impl-enc
+      (is (independent-name  impl-enc):iso-8859-5)))
+  (let ((impl-enc #+sbcl :koi8-r
+                  #+ccl +cannot-treat+
+                  #+clisp charset:koi8-r
+                  #+ecl +cannot-treat+
+                  #+abcl :koi8-r
+                  #+allegro :koi8-r
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :koi8-r) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :koi8-r)))
+  (let ((impl-enc #+sbcl :koi8-u
+                  #+ccl +cannot-treat+
+                  #+clisp charset:koi8-u
+                  #+ecl +cannot-treat+
+                  #+abcl :koi8-u
+                  #+allegro +cannot-treat+
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :koi8-u) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :koi8-u)))
+  (let ((impl-enc #+sbcl :cp866
+                  #+ccl +cannot-treat+
+                  #+clisp charset:cp866
+                  #+ecl :dos-cp866
+                  #+abcl :ibm866
+                  #+allegro +cannot-treat+
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :cp866) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :cp866)))
+  (let ((impl-enc #+sbcl :cp1251
+                  #+ccl +cannot-treat+
+                  #+clisp charset:windows-1251
+                  #+ecl :windows-cp1251
+                  #+abcl :|windows-1251|
+                  #+allegro :1251
+                  #+(and lispworks windows) '(win32:code-page :id 1251)))
+    (is (dependent-name :cp1251) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :cp1251))))
 
 (subtest "polish"
-  (is (dependent-name :iso-8859-2)
-      #+clisp charset:iso-8859-2
-      #+ecl :iso-8859-2
-      #+sbcl :iso-8859-2
-      #+ccl :iso-8859-2
-      #+abcl :iso-8859-2
-      #+allegro :iso8859-2
-      #+lispworks +cannot-treat+)
-  (is (dependent-name :cp1250)
-      #+clisp charset:windows-1250
-      #+ecl :windows-cp1250
-      #+sbcl :cp1250
-      #+ccl +cannot-treat+
-      #+abcl :|windows-1250|
-      #+allegro :1250
-      #+(and lispworks windows) '(win32:code-page :id 1250)))
+  (let ((impl-enc #+sbcl :iso-8859-2
+                  #+ccl :iso-8859-2
+                  #+clisp charset:iso-8859-2
+                  #+ecl :iso-8859-2
+                  #+abcl :iso-8859-2
+                  #+allegro :iso8859-2
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-8859-2) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :iso-8859-2)))
+  (let ((impl-enc #+sbcl :cp1250
+                  #+ccl +cannot-treat+
+                  #+clisp charset:windows-1250
+                  #+ecl :windows-cp1250
+                  #+abcl :|windows-1250|
+                  #+allegro :1250
+                  #+(and lispworks windows) '(win32:code-page :id 1250)))
+    (is (dependent-name :cp1250) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :cp1250))))
 
 (subtest "baltic"
-  (is (dependent-name :iso-8859-13)
-      #+clisp charset:iso-8859-13
-      #+ecl :iso-8859-13
-      #+sbcl :iso-8859-13
-      #+ccl :iso-8859-13
-      #+abcl :iso-8859-13
-      #+allegro +cannot-treat+
-      #+lispworks +cannot-treat+)
-  (is (dependent-name :cp1257)
-      #+clisp charset:windows-1257
-      #+ecl :windows-cp1257
-      #+sbcl :cp1257
-      #+ccl +cannot-treat+
-      #+abcl :|windows-1257|
-      #+allegro :1257
-      #+(and lispworks windows) '(win32:code-page :id 1257)))
+  (let ((impl-enc #+sbcl :iso-8859-13
+                  #+ccl :iso-8859-13
+                  #+clisp charset:iso-8859-13
+                  #+ecl :iso-8859-13
+                  #+abcl :iso-8859-13
+                  #+allegro +cannot-treat+
+                  #+lispworks +cannot-treat+))
+    (is (dependent-name :iso-8859-13) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :iso-8859-13)))
+  (let ((impl-enc #+sbcl :cp1257
+                  #+ccl +cannot-treat+
+                  #+clisp charset:windows-1257
+                  #+ecl :windows-cp1257
+                  #+abcl :|windows-1257|
+                  #+allegro :1257
+                  #+(and lispworks windows) '(win32:code-page :id 1257)))
+    (is (dependent-name :cp1257) impl-enc)
+    (unless impl-enc
+      (is (independent-name impl-enc) :cp1257))))
 
 (subtest "end of line"
-  (is (dependent-name :lf)
-      #+clisp :unix
-      #+ecl :lf
-      #+sbcl +cannot-treat+
-      #+ccl :unix
-      #+abcl :lf
-      #+allegro :unix  ; https://franz.com/support/documentation/10.1/doc/operators/excl/eol-convention.htm
-      #+lispworks :lf)
-  (is (dependent-name :cr)
-      #+clisp :mac
-      #+ecl :cr
-      #+sbcl +cannot-treat+
-      #+ccl :macos
-      #+abcl :cr
-      #+allegro :mac
-      #+lispworks :cr)
-  (is (dependent-name :crlf)
-      #+clisp :dos
-      #+ecl :crlf
-      #+sbcl +cannot-treat+
-      #+ccl :dos
-      #+abcl :crlf
-      #+allegro :doc
-      #+lispworks :crlf))
+  (let ((impl-eol #+sbcl +cannot-treat+
+                  #+ccl :unix
+                  #+clisp :unix
+                  #+ecl :lf
+                  #+abcl :lf
+                  ;; https://franz.com/support/documentation/10.1/doc/operators/excl/eol-convention.htm
+                  #+allegro :unix
+                  #+lispworks :lf))
+    (is (dependent-name :lf) impl-eol)
+    (unless impl-eol
+      (is (independent-name impl-eol) :lf)))
+  (let ((impl-eol #+sbcl +cannot-treat+
+                  #+ccl :macos
+                  #+clisp :mac
+                  #+ecl :cr
+                  #+abcl :cr
+                  #+allegro :mac
+                  #+lispworks :cr))
+    (is (dependent-name :cr) impl-eol)
+    (unless impl-eol
+      (is (independent-name impl-eol) :cr)))
+  (let ((impl-eol #+sbcl +cannot-treat+
+                  #+ccl :dos
+                  #+clisp :dos
+                  #+ecl :crlf
+                  #+abcl :crlf
+                  #+allegro :doc
+                  #+lispworks :crlf))
+    (is (dependent-name :crlf) impl-eol)
+    (unless impl-eol
+      (is (independent-name impl-eol) :crlf))))
 
 (subtest "if specified encodings is unicode?"
   (subtest "only unicode returns t"

From 1b3cb936f62358c2b0910155f651bb3f69c34d2f Mon Sep 17 00:00:00 2001
From: t-sin <shinichi.tanaka45@gmail.com>
Date: Sun, 22 Oct 2017 15:31:41 +0900
Subject: [PATCH 3/5] Removes

---
 t/names.lisp | 134 +++++++++++++++++++++++++--------------------------
 1 file changed, 66 insertions(+), 68 deletions(-)

diff --git a/t/names.lisp b/t/names.lisp
index e3a7964..b200f77 100644
--- a/t/names.lisp
+++ b/t/names.lisp
@@ -57,8 +57,6 @@
 
 (is +available-eols+ '(:lf :cr :crlf))
 
-(defvar +cannot-treat+ :cannot-treat)
-
 (subtest "unicode"
   (let ((impl-enc #+sbcl :utf-8
              #+ccl :utf-8
@@ -75,7 +73,7 @@
              #+clisp charset:unicode-16-little-endian
              #+ecl :utf-16le
              #+abcl :utf-16le
-             #+allegro +cannot-treat+
+             #+allegro :cannot-treat
              #+lispworks '(:unicode :little-endian)))
     (is (dependent-name :ucs-2le) impl-enc)
     (unless impl-enc
@@ -85,27 +83,27 @@
              #+clisp charset:unicode-16-big-endian
              #+ecl :utf-16be
              #+abcl :utf-16be
-             #+allegro +cannot-treat+
+             #+allegro :cannot-treat
              #+lispworks '(:unicode :big-endian)))
     (is (dependent-name :ucs-2be) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :ucs-2be)))
-  (let ((impl-enc #+sbcl +cannot-treat+
+  (let ((impl-enc #+sbcl :cannot-treat
              #+ccl :utf-16
              #+clisp charset:utf-16
              #+ecl :utf-16
              #+abcl :utf-16
-             #+allegro +cannot-treat+
-             #+lispworks +cannot-treat+))
+             #+allegro :cannot-treat
+             #+lispworks :cannot-treat))
     (is (dependent-name :utf-16) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :utf-16))))
 
 (subtest "japanese"
-  (let ((impl-enc #+sbcl +cannot-treat+
-             #+ccl +cannot-treat+
+  (let ((impl-enc #+sbcl :cannot-treat
+             #+ccl :cannot-treat
              #+clisp charset:iso-2022-jp
-             #+ecl +cannot-treat+
+             #+ecl :cannot-treat
              #+abcl :iso-2022-jp
              #+allegro :jis
              #+lispworks :jis))
@@ -115,7 +113,7 @@
   (let ((impl-enc #+sbcl :euc-jp
              #+ccl :euc-jp
              #+clisp charset:euc-jp
-             #+ecl +cannot-treat+
+             #+ecl :cannot-treat
              #+abcl :euc-jp
              #+allegro :euc
              #+lispworks :euc-jp))
@@ -134,8 +132,8 @@
       (is (independent-name impl-enc) :cp932))))
 
 (subtest "tiwanese"
-  (let ((impl-enc #+sbcl +cannot-treat+
-                  #+ccl +cannot-treat+
+  (let ((impl-enc #+sbcl :cannot-treat
+                  #+ccl :cannot-treat
                   #+clisp charset:big5
                   #+ecl :windows-cp950
                   #+abcl :|Big5|
@@ -145,12 +143,12 @@
     (unless impl-enc
       (is (independent-name impl-enc) :big5)))
    (let ((impl-enc #+clisp charset:euc-tw
-                   #+ecl +cannot-treat+
-                   #+sbcl +cannot-treat+
-                   #+ccl +cannot-treat+
+                   #+ecl :cannot-treat
+                   #+sbcl :cannot-treat
+                   #+ccl :cannot-treat
                    #+abcl :|x-EUC-TW|
-                   #+allegro +cannot-treat+
-                   #+lispworks +cannot-treat+))
+                   #+allegro :cannot-treat
+                   #+lispworks :cannot-treat))
      (is (dependent-name :iso-2022-tw) impl-enc)
      (unless impl-enc
        (is (independent-name impl-enc) :iso-2022-tw))))
@@ -162,35 +160,35 @@
                   #+clisp charset:gbk
                   #+ecl :windows-cp936
                   #+abcl :gbk
-                  #+allegro +cannot-treat+
+                  #+allegro :cannot-treat
                   #+lispworks :gbk))
     (is (dependent-name :gb2312) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :gb2312)))
-  (let ((impl-enc #+sbcl +cannot-treat+
-                  #+ccl +cannot-treat+
+  (let ((impl-enc #+sbcl :cannot-treat
+                  #+ccl :cannot-treat
                   #+clisp charset:gb18030
-                  #+ecl +cannot-treat+
+                  #+ecl :cannot-treat
                   #+abcl :gb18030
                   #+allegro :gb18030
-                  #+lispworks +cannot-treat+))
+                  #+lispworks :cannot-treat))
     (is (dependent-name :gb18030) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :gb18030)))
-  (let ((impl-enc #+sbcl +cannot-treat+
-                  #+ccl +cannot-treat+
+  (let ((impl-enc #+sbcl :cannot-treat
+                  #+ccl :cannot-treat
                   #+clisp charset:iso-2022-cn
-                  #+ecl +cannot-treat+
+                  #+ecl :cannot-treat
                   #+abcl :iso-2022-cn
-                  #+allegro +cannot-treat+
-                  #+lispworks +cannot-treat+))
+                  #+allegro :cannot-treat
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-2022-cn) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :iso-2022-cn))))
 
 (subtest "korean"
-  (let ((impl-enc #+sbcl +cannot-treat+
-                  #+ccl +cannot-treat+
+  (let ((impl-enc #+sbcl :cannot-treat
+                  #+ccl :cannot-treat
                   #+clisp charset:euc-kr
                   #+ecl :windows-cp949
                   #+abcl :euc-kr
@@ -199,23 +197,23 @@
     (is (dependent-name :euc-kr) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :euc-kr)))
-  (let ((impl-enc #+sbcl +cannot-treat+
-                  #+ccl +cannot-treat+
+  (let ((impl-enc #+sbcl :cannot-treat
+                  #+ccl :cannot-treat
                   #+clisp charset:johab
-                  #+ecl +cannot-treat+
+                  #+ecl :cannot-treat
                   #+abcl :|x-Johab|
-                  #+allegro +cannot-treat+
-                  #+lispworks +cannot-treat+))
+                  #+allegro :cannot-treat
+                  #+lispworks :cannot-treat))
     (is (dependent-name :johab) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :johab)))
-  (let ((impl-enc #+sbcl +cannot-treat+
-                  #+ccl +cannot-treat+
+  (let ((impl-enc #+sbcl :cannot-treat
+                  #+ccl :cannot-treat
                   #+clisp charset:iso-2022-kr
-                  #+ecl +cannot-treat+
+                  #+ecl :cannot-treat
                   #+abcl :iso-2022-kr
-                  #+allegro +cannot-treat+
-                  #+lispworks +cannot-treat+))
+                  #+allegro :cannot-treat
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-2022-kr) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc):iso-2022-kr))))
@@ -227,12 +225,12 @@
                   #+ecl :iso-8859-6
                   #+abcl :iso-8859-6
                   #+allegro iso8859-6
-                  #+lispworks +cannot-treat+))
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-6) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :iso-8859-6)))
   (let ((impl-enc #+sbcl :cp1256
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:windows-1256
                   #+ecl :windows-cp1256
                   #+abcl :|windows-1256|
@@ -249,12 +247,12 @@
                   #+ecl :iso-8859-7
                   #+abcl :iso-8859-7
                   #+allegro :iso8859-7
-                  #+lispworks +cannot-treat+))
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-7) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :iso-8859-7)))
   (let ((impl-enc #+sbcl :cp1253
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:windows-1253
                   #+ecl :windows-cp1253
                   #+abcl :|windows-1253|
@@ -271,12 +269,12 @@
                   #+ecl :iso-8859-8
                   #+abcl :iso-8859-8
                   #+allegro :iso8859-8
-                  #+lispworks +cannot-treat+))
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-8) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :iso-8859-8)))
   (let ((impl-enc #+sbcl :cp1255
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:windows-1255
                   #+ecl :windows-cp1255
                   #+abcl :|windows-1255|
@@ -293,12 +291,12 @@
                   #+ecl :iso-8859-9
                   #+abcl :iso-8859-9
                   #+allegro :iso8859-9
-                  #+lispworks +cannot-treat+))
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-9) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :iso-8859-9)))
   (let ((impl-enc #+sbcl :cp1254
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:windows-1254
                   #+ecl :windows-cp1254
                   #+abcl :|windows-1254|
@@ -315,42 +313,42 @@
                   #+ecl :iso-8859-5
                   #+abcl :iso-8859-5
                   #+allegro :iso8859-5
-                  #+lispworks +cannot-treat+))
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-5) impl-enc)
     (unless impl-enc
       (is (independent-name  impl-enc):iso-8859-5)))
   (let ((impl-enc #+sbcl :koi8-r
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:koi8-r
-                  #+ecl +cannot-treat+
+                  #+ecl :cannot-treat
                   #+abcl :koi8-r
                   #+allegro :koi8-r
-                  #+lispworks +cannot-treat+))
+                  #+lispworks :cannot-treat))
     (is (dependent-name :koi8-r) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :koi8-r)))
   (let ((impl-enc #+sbcl :koi8-u
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:koi8-u
-                  #+ecl +cannot-treat+
+                  #+ecl :cannot-treat
                   #+abcl :koi8-u
-                  #+allegro +cannot-treat+
-                  #+lispworks +cannot-treat+))
+                  #+allegro :cannot-treat
+                  #+lispworks :cannot-treat))
     (is (dependent-name :koi8-u) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :koi8-u)))
   (let ((impl-enc #+sbcl :cp866
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:cp866
                   #+ecl :dos-cp866
                   #+abcl :ibm866
-                  #+allegro +cannot-treat+
-                  #+lispworks +cannot-treat+))
+                  #+allegro :cannot-treat
+                  #+lispworks :cannot-treat))
     (is (dependent-name :cp866) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :cp866)))
   (let ((impl-enc #+sbcl :cp1251
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:windows-1251
                   #+ecl :windows-cp1251
                   #+abcl :|windows-1251|
@@ -367,12 +365,12 @@
                   #+ecl :iso-8859-2
                   #+abcl :iso-8859-2
                   #+allegro :iso8859-2
-                  #+lispworks +cannot-treat+))
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-2) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :iso-8859-2)))
   (let ((impl-enc #+sbcl :cp1250
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:windows-1250
                   #+ecl :windows-cp1250
                   #+abcl :|windows-1250|
@@ -388,13 +386,13 @@
                   #+clisp charset:iso-8859-13
                   #+ecl :iso-8859-13
                   #+abcl :iso-8859-13
-                  #+allegro +cannot-treat+
-                  #+lispworks +cannot-treat+))
+                  #+allegro :cannot-treat
+                  #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-13) impl-enc)
     (unless impl-enc
       (is (independent-name impl-enc) :iso-8859-13)))
   (let ((impl-enc #+sbcl :cp1257
-                  #+ccl +cannot-treat+
+                  #+ccl :cannot-treat
                   #+clisp charset:windows-1257
                   #+ecl :windows-cp1257
                   #+abcl :|windows-1257|
@@ -405,7 +403,7 @@
       (is (independent-name impl-enc) :cp1257))))
 
 (subtest "end of line"
-  (let ((impl-eol #+sbcl +cannot-treat+
+  (let ((impl-eol #+sbcl :cannot-treat
                   #+ccl :unix
                   #+clisp :unix
                   #+ecl :lf
@@ -416,7 +414,7 @@
     (is (dependent-name :lf) impl-eol)
     (unless impl-eol
       (is (independent-name impl-eol) :lf)))
-  (let ((impl-eol #+sbcl +cannot-treat+
+  (let ((impl-eol #+sbcl :cannot-treat
                   #+ccl :macos
                   #+clisp :mac
                   #+ecl :cr
@@ -426,7 +424,7 @@
     (is (dependent-name :cr) impl-eol)
     (unless impl-eol
       (is (independent-name impl-eol) :cr)))
-  (let ((impl-eol #+sbcl +cannot-treat+
+  (let ((impl-eol #+sbcl :cannot-treat
                   #+ccl :dos
                   #+clisp :dos
                   #+ecl :crlf

From 96747357805570a8b22420a270162f4e5f7583a2 Mon Sep 17 00:00:00 2001
From: t-sin <shinichi.tanaka45@gmail.com>
Date: Mon, 23 Oct 2017 23:25:33 +0900
Subject: [PATCH 4/5] Tests independent name when the target impl supported
 that encoding/eol

---
 t/names.lisp | 70 ++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/t/names.lisp b/t/names.lisp
index b200f77..3517129 100644
--- a/t/names.lisp
+++ b/t/names.lisp
@@ -66,7 +66,7 @@
              #+allegro :utf8
              #+lispworks :utf-8))
     (is (dependent-name :utf-8) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :utf-8)))
   (let ((impl-enc #+sbcl :utf-16le
              #+ccl :utf-16le
@@ -76,7 +76,7 @@
              #+allegro :cannot-treat
              #+lispworks '(:unicode :little-endian)))
     (is (dependent-name :ucs-2le) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :ucs-2le)))
   (let ((impl-enc #+sbcl :utf-16be
              #+ccl :utf-16be
@@ -86,7 +86,7 @@
              #+allegro :cannot-treat
              #+lispworks '(:unicode :big-endian)))
     (is (dependent-name :ucs-2be) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :ucs-2be)))
   (let ((impl-enc #+sbcl :cannot-treat
              #+ccl :utf-16
@@ -96,7 +96,7 @@
              #+allegro :cannot-treat
              #+lispworks :cannot-treat))
     (is (dependent-name :utf-16) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :utf-16))))
 
 (subtest "japanese"
@@ -108,7 +108,7 @@
              #+allegro :jis
              #+lispworks :jis))
     (is (dependent-name :iso-2022-jp) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :iso-2022-jp)))
   (let ((impl-enc #+sbcl :euc-jp
              #+ccl :euc-jp
@@ -118,7 +118,7 @@
              #+allegro :euc
              #+lispworks :euc-jp))
     (is (dependent-name :euc-jp) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :euc-jp)))
   (let ((impl-enc #+sbcl :shift_jis
              #+ccl :windows-31j
@@ -128,7 +128,7 @@
              #+allegro :shiftjis
              #+lispworks :sjis))
     (is (dependent-name :cp932) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :cp932))))
 
 (subtest "tiwanese"
@@ -140,7 +140,7 @@
                   #+allegro :big5
                   #+(and lispworks windows) '(win32:code-page :id 950)))
     (is (dependent-name :big5) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :big5)))
    (let ((impl-enc #+clisp charset:euc-tw
                    #+ecl :cannot-treat
@@ -150,7 +150,7 @@
                    #+allegro :cannot-treat
                    #+lispworks :cannot-treat))
      (is (dependent-name :iso-2022-tw) impl-enc)
-     (unless impl-enc
+     (unless (eq impl-enc :cannot-treat)
        (is (independent-name impl-enc) :iso-2022-tw))))
 
 (subtest "chinese"
@@ -163,7 +163,7 @@
                   #+allegro :cannot-treat
                   #+lispworks :gbk))
     (is (dependent-name :gb2312) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :gb2312)))
   (let ((impl-enc #+sbcl :cannot-treat
                   #+ccl :cannot-treat
@@ -173,7 +173,7 @@
                   #+allegro :gb18030
                   #+lispworks :cannot-treat))
     (is (dependent-name :gb18030) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :gb18030)))
   (let ((impl-enc #+sbcl :cannot-treat
                   #+ccl :cannot-treat
@@ -183,7 +183,7 @@
                   #+allegro :cannot-treat
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-2022-cn) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :iso-2022-cn))))
 
 (subtest "korean"
@@ -195,7 +195,7 @@
                   #+allegro :949
                   #+(and lispworks windows) '(win32:code-page :id 949)))
     (is (dependent-name :euc-kr) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :euc-kr)))
   (let ((impl-enc #+sbcl :cannot-treat
                   #+ccl :cannot-treat
@@ -205,7 +205,7 @@
                   #+allegro :cannot-treat
                   #+lispworks :cannot-treat))
     (is (dependent-name :johab) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :johab)))
   (let ((impl-enc #+sbcl :cannot-treat
                   #+ccl :cannot-treat
@@ -215,7 +215,7 @@
                   #+allegro :cannot-treat
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-2022-kr) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc):iso-2022-kr))))
 
 (subtest "arabic"
@@ -227,7 +227,7 @@
                   #+allegro iso8859-6
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-6) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :iso-8859-6)))
   (let ((impl-enc #+sbcl :cp1256
                   #+ccl :cannot-treat
@@ -237,7 +237,7 @@
                   #+allegro :1256
                   #+(and lispworks windows) '(win32:code-page :id 1256)))
     (is (dependent-name :cp1256) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (dependent-name impl-enc) :cp1256))))
 
 (subtest "greek"
@@ -249,7 +249,7 @@
                   #+allegro :iso8859-7
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-7) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :iso-8859-7)))
   (let ((impl-enc #+sbcl :cp1253
                   #+ccl :cannot-treat
@@ -259,7 +259,7 @@
                   #+allegro :1253
                   #+(and lispworks windows) '(win32:code-page :id 1253)))
     (is (dependent-name :cp1253) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :cp1253))))
 
 (subtest "hebrew"
@@ -271,7 +271,7 @@
                   #+allegro :iso8859-8
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-8) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :iso-8859-8)))
   (let ((impl-enc #+sbcl :cp1255
                   #+ccl :cannot-treat
@@ -281,7 +281,7 @@
                   #+allegro :1255
                   #+(and lispworks windows) '(win32:code-page :id 1255)))
     (is (dependent-name :cp1255) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :cp1255))))
 
 (subtest "turkish"
@@ -293,7 +293,7 @@
                   #+allegro :iso8859-9
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-9) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :iso-8859-9)))
   (let ((impl-enc #+sbcl :cp1254
                   #+ccl :cannot-treat
@@ -303,7 +303,7 @@
                   #+allegro :1254
                   #+(and lispworks windows) '(win32:code-page :id 1254)))
     (is (dependent-name :cp1254) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :cp1254))))
 
 (subtest "russian"
@@ -315,7 +315,7 @@
                   #+allegro :iso8859-5
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-5) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name  impl-enc):iso-8859-5)))
   (let ((impl-enc #+sbcl :koi8-r
                   #+ccl :cannot-treat
@@ -325,7 +325,7 @@
                   #+allegro :koi8-r
                   #+lispworks :cannot-treat))
     (is (dependent-name :koi8-r) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :koi8-r)))
   (let ((impl-enc #+sbcl :koi8-u
                   #+ccl :cannot-treat
@@ -335,7 +335,7 @@
                   #+allegro :cannot-treat
                   #+lispworks :cannot-treat))
     (is (dependent-name :koi8-u) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :koi8-u)))
   (let ((impl-enc #+sbcl :cp866
                   #+ccl :cannot-treat
@@ -345,7 +345,7 @@
                   #+allegro :cannot-treat
                   #+lispworks :cannot-treat))
     (is (dependent-name :cp866) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :cp866)))
   (let ((impl-enc #+sbcl :cp1251
                   #+ccl :cannot-treat
@@ -355,7 +355,7 @@
                   #+allegro :1251
                   #+(and lispworks windows) '(win32:code-page :id 1251)))
     (is (dependent-name :cp1251) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :cp1251))))
 
 (subtest "polish"
@@ -367,7 +367,7 @@
                   #+allegro :iso8859-2
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-2) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :iso-8859-2)))
   (let ((impl-enc #+sbcl :cp1250
                   #+ccl :cannot-treat
@@ -377,7 +377,7 @@
                   #+allegro :1250
                   #+(and lispworks windows) '(win32:code-page :id 1250)))
     (is (dependent-name :cp1250) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :cp1250))))
 
 (subtest "baltic"
@@ -389,7 +389,7 @@
                   #+allegro :cannot-treat
                   #+lispworks :cannot-treat))
     (is (dependent-name :iso-8859-13) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :iso-8859-13)))
   (let ((impl-enc #+sbcl :cp1257
                   #+ccl :cannot-treat
@@ -399,7 +399,7 @@
                   #+allegro :1257
                   #+(and lispworks windows) '(win32:code-page :id 1257)))
     (is (dependent-name :cp1257) impl-enc)
-    (unless impl-enc
+    (unless (eq impl-enc :cannot-treat)
       (is (independent-name impl-enc) :cp1257))))
 
 (subtest "end of line"
@@ -412,7 +412,7 @@
                   #+allegro :unix
                   #+lispworks :lf))
     (is (dependent-name :lf) impl-eol)
-    (unless impl-eol
+    (unless (eq impl-eol :cannot-treat)
       (is (independent-name impl-eol) :lf)))
   (let ((impl-eol #+sbcl :cannot-treat
                   #+ccl :macos
@@ -422,7 +422,7 @@
                   #+allegro :mac
                   #+lispworks :cr))
     (is (dependent-name :cr) impl-eol)
-    (unless impl-eol
+    (unless (eq impl-eol :cannot-treat)
       (is (independent-name impl-eol) :cr)))
   (let ((impl-eol #+sbcl :cannot-treat
                   #+ccl :dos
@@ -432,7 +432,7 @@
                   #+allegro :doc
                   #+lispworks :crlf))
     (is (dependent-name :crlf) impl-eol)
-    (unless impl-eol
+    (unless (eq impl-eol :cannot-treat)
       (is (independent-name impl-eol) :crlf))))
 
 (subtest "if specified encodings is unicode?"

From f4dc5401e422c709e388382adddcd4d61b598e52 Mon Sep 17 00:00:00 2001
From: t-sin <shinichi.tanaka45@gmail.com>
Date: Mon, 23 Oct 2017 23:43:07 +0900
Subject: [PATCH 5/5] Fixes arabic cp1256 test

---
 t/names.lisp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/names.lisp b/t/names.lisp
index 3517129..cf2e8b5 100644
--- a/t/names.lisp
+++ b/t/names.lisp
@@ -238,7 +238,7 @@
                   #+(and lispworks windows) '(win32:code-page :id 1256)))
     (is (dependent-name :cp1256) impl-enc)
     (unless (eq impl-enc :cannot-treat)
-      (is (dependent-name impl-enc) :cp1256))))
+      (is (independent-name impl-enc) :cp1256))))
 
 (subtest "greek"
   (let ((impl-enc #+sbcl :iso-8859-7