Be more robust.

Fix for allegro and any implementation that would error
while looking up an encoding that doesn't exist.

Make the ASD file more robust.

diff --git a/asdf-encodings.asd b/asdf-encodings.asd
index 1c46e28..31b20f1 100644 (file)
--- a/asdf-encodings.asd
+++ b/asdf-encodings.asd
@@ -1,12 +1,8 @@
 ;;; -*- Mode: Lisp ; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
 
-;; Ensure upgrade, so #+asdf-unicode below has better chances of working.
-(asdf:oos 'asdf:load-op :asdf)
-
 (asdf:defsystem :asdf-encodings
+  :defsystem-depends-on (:asdf)
   :description "Portable interface to character encodings and your implementation's external-format"
-  :depends-on ((:version "asdf" "2.20.18"))
-  #+asdf-unicode #+asdf-unicode ;; disabled in implementations with no unicode support.
   :components
   ((:file "pkgdcl")
    (:file "encodings" :depends-on ("pkgdcl"))
@@ -14,6 +10,9 @@
    (:file "asdf-support" :depends-on ("pkgdcl"))
    (:file "initialization" :depends-on ("pkgdcl"))))
 
+(unless (find-symbol (string :component-encoding) :asdf)
+  (error "asdf-encodings requires asdf 2.20.18 or later"))
+
 (defmethod perform ((op test-op) (system (eql (find-system :asdf-encodings))))
   (asdf:load-system :asdf-encodings-test)
   (funcall (asdf::find-symbol* :test-suite :asdf-encodings-test)))

diff --git a/encodings.lisp b/encodings.lisp
index a0cda8e..1ae1f77 100644 (file)
--- a/encodings.lisp
+++ b/encodings.lisp
@@ -142,14 +142,15 @@
 
 (defun find-implementation-encoding (encoding)
   (declare (ignorable encoding)) nil ;; default, for unsupported implementations
-  #+abcl (normalize-encoding encoding) ;; we bootstrap that in initialize-normalized-encodings
-  #+allegro (excl:find-external-format encoding)
-  #+clozure (ignore-errors (ccl::normalize-external-format t encoding))
-  #+clisp (find-symbol* encoding :charset)
-  #+cmu (stream::find-external-format encoding)
-  #+ecl (ignore-errors (ext:make-encoding encoding))
-  #+lispworks
-  (or
+  (ignore-errors
+   #+abcl (normalize-encoding encoding) ;; we bootstrap that in initialize-normalized-encodings
+   #+allegro (excl:find-external-format encoding)
+   #+clozure (ccl::normalize-external-format t encoding)
+   #+clisp (find-symbol* encoding :charset)
+   #+cmu (stream::find-external-format encoding)
+   #+ecl (ext:make-encoding encoding)
+   #+lispworks
+   (or
    (case encoding
      ;; lispworks supports a :jis, but which encoding is it?
      ((:latin-1 :ascii :utf-8 :sjis :euc-jp :macos-roman) encoding)
@@ -162,10 +163,10 @@
           (multiple-value-bind (i l)
               (parse-integer s :start 3 :junk-allowed t)
             (and i (= l (length s)) `(win32:code-page :id ,i))))))
-  #+sbcl (and (sb-impl::get-external-format encoding) encoding)
-  #+scl (and (or (lisp::encoding-character-width encoding) ; only works for fixed-width
-                 (member encoding '(:utf-8 :utf-16 :utf-16le :utf-16be))) ; more may exist
-             encoding))
+   #+sbcl (and (sb-impl::get-external-format encoding) encoding)
+   #+scl (and (or (lisp::encoding-character-width encoding) ; only works for fixed-width
+                  (member encoding '(:utf-8 :utf-16 :utf-16le :utf-16be))) ; more may exist
+              encoding)))
 
 (defun initialize-normalized-encodings (&optional warn)
   #+abcl