Signal an error when a named codec could not be found.

[lisp-utils.git] / charcode.lisp

diff --git a/charcode.lisp b/charcode.lisp
index 6c08f42..ac1c74d 100644 (file)
--- a/charcode.lisp
+++ b/charcode.lisp
@@ -4,13 +4,19 @@
 (defpackage :charcode
   (:use :cl #+sbcl :sb-gray #-sbcl :gray)
   (:export "MAKE-ENCODER" "MAKE-DECODER" "ENCODE-STRING" "DECODE-STRING" "SYSTEM-CHARSET"
-          "CODING-ERROR"
+          "NO-CODEC-ERROR" "CODING-ERROR"
           "MAKE-CODEC-CHARACTER-STREAM"
           "ASCII" "LATIN-1" "LATIN1" "UTF-8" "UTF8"))
 (in-package :charcode)
 
 ;;; General stuff
 
+(define-condition no-codec-error (error)
+  ((codec-name :initarg :codec-name))
+  (:report (lambda (c s)
+            (with-slots (codec-name) c
+              (format s "Could find no codec named ~A." codec-name)))))
+
 (define-condition coding-error (error)
   ((input :initarg :input)
    (position :initarg :position)
@@ -46,10 +52,12 @@
               synonyms)))
 
 (defun make-encoder (name)
-  (the encoder-fun (values (funcall (get name 'make-encoder)))))
+  (the encoder-fun (values (funcall (or (get name 'make-encoder)
+                                       (error 'no-codec-error :codec-name name))))))
 
 (defun make-decoder (name)
-  (the decoder-fun (values (funcall (get name 'make-decoder)))))
+  (the decoder-fun (values (funcall (or (get name 'make-decoder)
+                                       (error 'no-codec-error :codec-name name))))))
 
 (defun system-charset ()
   ;; XXX: Replace me with something perhaps more sensible.
@@ -241,6 +249,8 @@
 (define-encoder (ascii)
   #'encode-ascii)
 
+(define-codec-synonyms ascii :ascii)
+
 ;;; Latin-1
 
 (defun decode-latin-1 (byteseq charseq &key (start 0) (end (length byteseq)))
@@ -278,7 +288,7 @@
 (define-encoder (latin-1)
   #'encode-latin-1)
 
-(define-codec-synonyms latin-1 latin1 iso-8859-1)
+(define-codec-synonyms latin-1 latin1 iso-8859-1 :latin-1 :latin1 :iso-8859-1)
 
 ;;; UTF-8
 
@@ -362,4 +372,4 @@
                        (setf mlen 0))))))))
       #'decode)))
 
-(define-codec-synonyms utf-8 utf8)
+(define-codec-synonyms utf-8 utf8 :utf-8 :utf8)