--- a/package-test.lisp Fri Feb 17 13:19:33 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-(defpackage :temperance-test
- (:use :cl :1am))
-
-(defpackage :temperance-test.utils
- (:use
- :cl
- :1am
- :temperance
- :temperance.quickutils)
- (:export
- :fail
- :empty
- :result=
- :results=
- :should-fail
- :should-return
- :define-test
- :%=
- :%not
- :%append
- :%member))
-
-(defpackage :temperance-test.wam
- (:use
- :cl
- :1am
- :temperance-test.utils
- :temperance.quickutils
- :temperance)
- (:import-from :temperance
- :with-database
- :make-database
- :with-fresh-database
- :push-logic-frame-with
- :rule
- :fact
- :facts
- :call
- :dump-wam-full
- :?
- :!
- :query
- :query-all))
-
-(defpackage :temperance-test.99
- (:use
- :cl
- :1am
- :temperance-test.utils
- :temperance.quickutils
- :temperance)
- (:import-from :temperance
- :with-fresh-database
- :push-logic-frame-with
- :rule
- :fact
- :facts
- :call
- :dump-wam-full
- :?
- :!
- :query
- :query-all))
-
-(defpackage :temperance-test.taop
- (:use
- :cl
- :1am
- :temperance-test.utils
- :temperance.quickutils
- :temperance)
- (:import-from :temperance
- :with-fresh-database
- :push-logic-frame-with
- :rule
- :fact
- :facts
- :call
- :dump-wam-full
- :?
- :!
- :query
- :query-all))
-
-(defpackage :temperance-test.circle
- (:use
- :cl
- :1am
- :temperance-test.utils
- :temperance.circle))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package.test.lisp Fri Feb 17 13:31:15 2017 +0000
@@ -0,0 +1,90 @@
+(defpackage :temperance.test
+ (:use :cl :1am))
+
+(defpackage :temperance.test.utils
+ (:use
+ :cl
+ :1am
+ :temperance
+ :temperance.quickutils)
+ (:export
+ :fail
+ :empty
+ :result=
+ :results=
+ :should-fail
+ :should-return
+ :define-test
+ :%=
+ :%not
+ :%append
+ :%member))
+
+(defpackage :temperance.test.wam
+ (:use
+ :cl
+ :1am
+ :temperance.test.utils
+ :temperance.quickutils
+ :temperance)
+ (:import-from :temperance
+ :with-database
+ :make-database
+ :with-fresh-database
+ :push-logic-frame-with
+ :rule
+ :fact
+ :facts
+ :call
+ :dump-wam-full
+ :?
+ :!
+ :query
+ :query-all))
+
+(defpackage :temperance.test.99
+ (:use
+ :cl
+ :1am
+ :temperance.test.utils
+ :temperance.quickutils
+ :temperance)
+ (:import-from :temperance
+ :with-fresh-database
+ :push-logic-frame-with
+ :rule
+ :fact
+ :facts
+ :call
+ :dump-wam-full
+ :?
+ :!
+ :query
+ :query-all))
+
+(defpackage :temperance.test.taop
+ (:use
+ :cl
+ :1am
+ :temperance.test.utils
+ :temperance.quickutils
+ :temperance)
+ (:import-from :temperance
+ :with-fresh-database
+ :push-logic-frame-with
+ :rule
+ :fact
+ :facts
+ :call
+ :dump-wam-full
+ :?
+ :!
+ :query
+ :query-all))
+
+(defpackage :temperance.test.circle
+ (:use
+ :cl
+ :1am
+ :temperance.test.utils
+ :temperance.circle))
--- a/src/temperance.lisp Fri Feb 17 13:19:33 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-(in-package :temperance)
-
-(defun hello ()
- 1)
-
-
--- a/temperance.asd Fri Feb 17 13:19:33 2017 +0000
+++ b/temperance.asd Fri Feb 17 13:31:15 2017 +0000
@@ -1,17 +1,16 @@
(asdf:defsystem :temperance
- :name "temperance"
:description "A logic programming library for Common Lisp."
:author "Steve Losh <steve@stevelosh.com>"
:maintainer "Steve Losh <steve@stevelosh.com>"
:license "MIT/X11"
- :version "0.0.1"
+ :version "1.0.0"
:depends-on (:cl-arrows
:policy-cond)
- :in-order-to ((asdf:test-op (asdf:test-op :temperance-test)))
+ :in-order-to ((asdf:test-op (asdf:test-op :temperance.test)))
:serial t
:components ((:module "vendor"
@@ -40,30 +39,4 @@
(:file "8-ui")))
(:file "vm")
(:file "dump")
- (:file "ui")
- (:file "temperance")))))
-
-(asdf:defsystem :temperance-test
- :name "temperance-test"
- :description "Test suite for Temperance."
-
- :author "Steve Losh <steve@stevelosh.com>"
- :license "MIT/X11"
-
- :depends-on (:temperance
- :1am)
-
- :perform (asdf:test-op
- (op system)
- (uiop:symbol-call :temperance-test :run-tests))
-
- :serial t
- :components ((:file "package-test")
- (:module "test"
- :serial t
- :components ((:file "temperance")
- (:file "utils")
- (:file "circle")
- (:file "wam")
- (:file "99")
- (:file "taop")))))
+ (:file "ui")))))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/temperance.test.asd Fri Feb 17 13:31:15 2017 +0000
@@ -0,0 +1,23 @@
+(asdf:defsystem :temperance.test
+ :description "Test suite for Temperance."
+
+ :author "Steve Losh <steve@stevelosh.com>"
+ :license "MIT/X11"
+
+ :depends-on (:temperance
+ :1am)
+
+ :perform (asdf:test-op
+ (op system)
+ (uiop:symbol-call :temperance.test :run-tests))
+
+ :serial t
+ :components ((:file "package.test")
+ (:module "test"
+ :serial t
+ :components ((:file "temperance")
+ (:file "utils")
+ (:file "circle")
+ (:file "wam")
+ (:file "99")
+ (:file "taop")))))
--- a/test/99.lisp Fri Feb 17 13:19:33 2017 +0000
+++ b/test/99.lisp Fri Feb 17 13:31:15 2017 +0000
@@ -1,4 +1,4 @@
-(in-package :temperance-test.99)
+(in-package :temperance.test.99)
;;;; 99 Prolog Problems
;;; http://www.ic.unicamp.br/~meidanis/courses/mc336/2009s2/prolog/problemas/
--- a/test/circle.lisp Fri Feb 17 13:19:33 2017 +0000
+++ b/test/circle.lisp Fri Feb 17 13:31:15 2017 +0000
@@ -1,4 +1,4 @@
-(in-package :temperance-test.circle)
+(in-package :temperance.test.circle)
(defmacro is-circle-contents (circle values)
`(is (equal ,values
--- a/test/run.lisp Fri Feb 17 13:19:33 2017 +0000
+++ b/test/run.lisp Fri Feb 17 13:31:15 2017 +0000
@@ -8,7 +8,7 @@
(ql:quickload 'temperance)
;; Recompile to ensure we get the right optimize declarations...
(asdf:load-system 'temperance :force t)
- (ql:quickload 'temperance-test))
+ (ql:quickload 'temperance.test))
(time (prog1
(asdf:test-system 'temperance)
--- a/test/taop.lisp Fri Feb 17 13:19:33 2017 +0000
+++ b/test/taop.lisp Fri Feb 17 13:31:15 2017 +0000
@@ -1,4 +1,4 @@
-(in-package :temperance-test.taop)
+(in-package :temperance.test.taop)
;; Examples and exercises from The Art of Prolog
--- a/test/temperance.lisp Fri Feb 17 13:19:33 2017 +0000
+++ b/test/temperance.lisp Fri Feb 17 13:31:15 2017 +0000
@@ -1,4 +1,4 @@
-(in-package :temperance-test)
+(in-package :temperance.test)
(defun run-tests ()
(1am:run))
--- a/test/utils.lisp Fri Feb 17 13:19:33 2017 +0000
+++ b/test/utils.lisp Fri Feb 17 13:31:15 2017 +0000
@@ -1,4 +1,4 @@
-(in-package :temperance-test.utils)
+(in-package :temperance.test.utils)
;;;; Utils
--- a/test/wam.lisp Fri Feb 17 13:19:33 2017 +0000
+++ b/test/wam.lisp Fri Feb 17 13:31:15 2017 +0000
@@ -1,4 +1,4 @@
-(in-package :temperance-test.wam)
+(in-package :temperance.test.wam)
;;;; Setup
(defun make-test-database ()