More consistent behavior under type lookup failure.

bitlisp · Apr 26, 2012 · 2c36101 · 2c36101
1 parent 6a7b398
commit 2c36101
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/types.lisp b/src/types.lisp
@@ -180,8 +180,11 @@
 (defun type-resolve (code &optional (env *primitives-env*))
   (etypecase code
     (integer code)
-    ((or bl-symbol string) (or (lookup code :type env)
-                               (error "~A names no type binding!" code)))
+    ((or bl-symbol string) (multiple-value-bind (type exists)
+                               (lookup code :type env)
+                             (if exists
+                                 type
+                                 (error "Type ~A is not in scope!" code))))
     (list (let ((ctor (type-resolve (first code) env)))
             (typecase ctor
               (special-tycon (apply (special-tycon-resolver ctor)