Merge pull request #4 from DalekBaldwin/clisp-toplevel-defpackage-fix-2

split defpackages into separate files

Author: bobbysmith007

assert-package.lisp

@@ -0,0 +1,47 @@
+(in-package :cl-user)
+
+(handler-bind
+    ;; fixes sbcl SUPER warnings that prevent automatic fasl loading
+    ((warning (lambda (c)
+                (format *error-output* "~A~%~S" c c)
+                (muffle-warning c))))
+  (defpackage :lisp-unit2-asserts
+    (:import-from :lisp-unit2
+     :assert-eq :assert-eql :assert-equal :assert-equalp
+     :assert-equality :assert-prints :assert-expands :assert-true
+     :assert-false :assert-error :assert-no-error
+     :assert-warning :assert-no-warning
+     :assert-signal :assert-no-signal
+     :assert-typep
+     ;; floating point
+     :*measure* :*epsilon* :*significant-figures*
+     :default-epsilon :sumsq :sump :norm
+     :relative-error :relative-error-norm
+     :array-error
+     :float-equal :assert-float-equal
+     :sigfig-equal :assert-sigfig-equal
+     :norm-equal :assert-norm-equal
+     :number-equal :assert-number-equal
+     :numerical-equal :assert-numerical-equal
+     ;; rational
+     :assert-rational-equal :rational-equal)
+    (:export
+     :assert-eq :assert-eql :assert-equal :assert-equalp
+     :assert-equality :assert-prints :assert-expands :assert-true
+     :assert-false :assert-error :assert-no-error
+     :assert-warning :assert-no-warning
+     :assert-signal :assert-no-signal
+     :assert-typep
+     ;; floating point
+     :*measure* :*epsilon* :*significant-figures*
+     :default-epsilon :sumsq :sump :norm
+     :relative-error :relative-error-norm
+     :array-error
+     :float-equal :assert-float-equal
+     :sigfig-equal :assert-sigfig-equal
+     :norm-equal :assert-norm-equal
+     :number-equal :assert-number-equal
+     :numerical-equal :assert-numerical-equal
+     ;; rational
+     :assert-rational-equal :rational-equal
+     )))

lisp-unit2.asd

@@ -9,7 +9,8 @@
   :license "MIT"
   :serial t
   :components
-  ((:file "packages")
+  ((:file "package")
+   (:file "assert-package")
    (:file "vars")
    (:file "collectors")
    (:file "asserts")
@@ -69,4 +70,4 @@
   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
   OTHER DEALINGS IN THE SOFTWARE.
 
-|#
+|#

packages.lisp package.lisppackages.lisp renamed to package.lisp

@@ -89,49 +89,3 @@
              :results)
     ;; Utility predicates
     (:export :logically-equal :set-equal)))
-
-(handler-bind
-    ;; fixes sbcl SUPER warnings that prevent automatic fasl loading
-    ((warning (lambda (c)
-                (format *error-output* "~A~%~S" c c)
-                (muffle-warning c))))
-  (defpackage :lisp-unit2-asserts
-    (:import-from :lisp-unit2
-     :assert-eq :assert-eql :assert-equal :assert-equalp
-     :assert-equality :assert-prints :assert-expands :assert-true
-     :assert-false :assert-error :assert-no-error
-     :assert-warning :assert-no-warning
-     :assert-signal :assert-no-signal
-     :assert-typep
-     ;; floating point
-     :*measure* :*epsilon* :*significant-figures*
-     :default-epsilon :sumsq :sump :norm
-     :relative-error :relative-error-norm
-     :array-error
-     :float-equal :assert-float-equal
-     :sigfig-equal :assert-sigfig-equal
-     :norm-equal :assert-norm-equal
-     :number-equal :assert-number-equal
-     :numerical-equal :assert-numerical-equal
-     ;; rational
-     :assert-rational-equal :rational-equal)
-    (:export
-     :assert-eq :assert-eql :assert-equal :assert-equalp
-     :assert-equality :assert-prints :assert-expands :assert-true
-     :assert-false :assert-error :assert-no-error
-     :assert-warning :assert-no-warning
-     :assert-signal :assert-no-signal
-     :assert-typep
-     ;; floating point
-     :*measure* :*epsilon* :*significant-figures*
-     :default-epsilon :sumsq :sump :norm
-     :relative-error :relative-error-norm
-     :array-error
-     :float-equal :assert-float-equal
-     :sigfig-equal :assert-sigfig-equal
-     :norm-equal :assert-norm-equal
-     :number-equal :assert-number-equal
-     :numerical-equal :assert-numerical-equal
-     ;; rational
-     :assert-rational-equal :rational-equal
-     )))