@@ -21,14 +21,8 @@

 (defparameter *kr-version* "2.3.4")

 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defvar *special-kr-optimization*

-    '(optimize

-      (speed 3)

-      #-allegro (safety 0) #+allegro (safety 1)

-      (space 0)

-      #-cmu (debug 0)

-      #+cmu (debug 0.5)

-      )))

+  (defparameter *special-kr-optimization*

+    '(optimize (speed 3) (safety 1) (space 0) (debug 0))))

 ;; This enables the eager-evaluation version.

 ;;  Currently turned off.

@@ -622,6 +616,9 @@

 ;; Moved type functions to kr.lisp (to get rid of free variable warnings).

+(define-condition kr-type-error (error)

+  ((%message :initarg :message :reader kr-type-error-message)))

+

 ;;; DEF-KR-TYPE

 ;;

 ;; Create a new type, which can then be used for typechecking.

@@ -644,17 +641,20 @@ You can also provide a documentation string as the last parameter, as in:

      (def-kr-type my-named-type () '(or keyword null) \"Sample doc string\")"

   (cond ((listp typename-or-type)

-	   (unless (eq (car typename-or-type) 'QUOTE)

-	     (error "Illegal typename to def-kr-type: ~S" typename-or-type))

-	   (unless (and (null args) (null body) (null type-doc))

-	     (error "Illegal specification: (DEF-KR-TYPE ~S ~S ~S ~S)"

-			typename-or-type args body type-doc))

-	   (setq body typename-or-type)

-	   (setq typename-or-type NIL))

+         (unless (eq (car typename-or-type) 'QUOTE)

+           (error 'kr-type-error

+                  :message (format nil "Illegal typename to def-kr-type: ~S" typename-or-type)))

+         (unless (and (null args) (null body) (null type-doc))

+           (error 'kr-type-error

+                  :message (format nil "Illegal specification: (DEF-KR-TYPE ~S ~S ~S ~S)"

+                                   typename-or-type args body type-doc)))

+         (setq body typename-or-type)

+         (setq typename-or-type NIL))

         (args

-	   (error "DEF-KR-TYPE only works with NULL args, not ~S~%" args))

+         (error 'kr-type-error

+                :message (format nil "DEF-KR-TYPE only works with NULL args, not ~S~%" args)))

         (T

-	   (setq typename-or-type (symbol-name typename-or-type))))

+         (setq typename-or-type (symbol-name typename-or-type))))

   (setq body (eval body))

   `(add-new-type ,typename-or-type ',body ,(type-to-fn body) ,type-doc))

@@ -1,8 +1,8 @@

 (in-package :cl-user)

-(defpackage :garnet-utils

+(defpackage :fwoar.garnet-utils

   (:use :common-lisp)

-  (:nicknames :gu)

+  (:nicknames :fw.gu)

   (:export *garnet-break-key*

            2pi -2pi

            add-to-list

@@ -24,11 +24,12 @@

            white

            while))

-(defpackage :kr-debug

+(defpackage :fwoar.kr-debug

   (:use :common-lisp))

-(defpackage :kr

-  (:use :common-lisp :kr-debug)

+(defpackage :fwoar.kr

+  (:use :common-lisp :fwoar.kr-debug)

+  (:nicknames :kr)

   (:export schema

            create-instance

            create-prototype

@@ -10,7 +10,7 @@

 ;; Host of Lisp utilities used by other Garnet code.

-(in-package :garnet-utils)

+(in-package :fwoar.garnet-utils)

 (defvar *debug-utils-mode* t)

@@ -1,5 +1,5 @@

-(in-package :garnet-utils)

+(in-package :fwoar.garnet-utils)

 (defvar black nil)

 (defvar white nil)