5977919552ee

Rename the project

I really liked the old name, but there's like sixteen Lisp things with
"Bone"-related names so I'll make the sacrifice.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Sat, 20 Aug 2016 22:25:47 +0000
parents 81939d20415a
children 66c01894e34c
branches/tags (none)
files Makefile README.markdown bones.asd docs/api.lisp docs/index.markdown docs/title package-test.lisp package.lisp src/bones.lisp src/bytecode.lisp src/circle.lisp src/compiler/0-data.lisp src/compiler/1-parsing.lisp src/compiler/2-register-allocation.lisp src/compiler/3-flattening.lisp src/compiler/4-tokenization.lisp src/compiler/5-precompilation.lisp src/compiler/6-optimization.lisp src/compiler/7-rendering.lisp src/compiler/8-ui.lisp src/constants.lisp src/dump.lisp src/temperance.lisp src/types.lisp src/ui.lisp src/utils.lisp src/vm.lisp src/wam.lisp temperance.asd test/99.lisp test/bones.lisp test/circle.lisp test/run.lisp test/taop.lisp test/temperance.lisp test/utils.lisp test/wam.lisp vendor/make-quickutils.lisp vendor/quickutils.lisp

Changes

--- a/Makefile	Sat Aug 20 22:06:27 2016 +0000
+++ b/Makefile	Sat Aug 20 22:25:47 2016 +0000
@@ -1,6 +1,6 @@
-.PHONY: test pubdocs test-sbcl test-ccl test-ecl
+.PHONY: test docs pubdocs test-sbcl test-ccl test-ecl
 
-sourcefiles = $(shell ffind --full-path --dir src --literal .lisp)
+sourcefiles = $(shell ffind --full-path --literal .lisp)
 docfiles = $(shell ls docs/*.markdown)
 apidoc = docs/03-reference.markdown
 
@@ -31,11 +31,11 @@
 
 docs: docs/build/index.html
 
-docs/build/index.html: $(docfiles)
+docs/build/index.html: $(docfiles) $(apidoc)
 	cd docs && ~/.virtualenvs/d/bin/d
 
 pubdocs: docs
 	hg -R ~/src/sjl.bitbucket.org pull -u
-	rsync --delete -a ./docs/build/ ~/src/sjl.bitbucket.org/bones
-	hg -R ~/src/sjl.bitbucket.org commit -Am 'bones: Update site.'
+	rsync --delete -a ./docs/build/ ~/src/sjl.bitbucket.org/temperance
+	hg -R ~/src/sjl.bitbucket.org commit -Am 'temperance: Update site.'
 	hg -R ~/src/sjl.bitbucket.org push
--- a/README.markdown	Sat Aug 20 22:06:27 2016 +0000
+++ b/README.markdown	Sat Aug 20 22:25:47 2016 +0000
@@ -1,19 +1,20 @@
-    eeeee  eeeee eeeee eeee eeeee
-    8   8  8  88 8   8 8    8   "
-    8eee8e 8   8 8e  8 8eee 8eeee
-    88   8 8   8 88  8 88      88
-    88eee8 8eee8 88  8 88ee 8ee88
+    ,--,--'
+    `- | ,-. ,-,-. ,-. ,-. ,-. ,-. ,-. ,-. ,-.
+     , | |-' | | | | | |-' |   ,-| | | |   |-'
+     `-' `-' ' ' ' |-' `-' '   `-^ ' ' `-' `-'
+                   |
+                   '
 
-Bones is a logic programming library for Common Lisp.
+Temperance is a logic programming library for Common Lisp.
 
-**Bones is still in development, don't actually try to use this for anything
-yet.  It should be usable by mid-2016.**
+**Temperance is still in development, don't actually try to use this for
+anything yet.  It should be usable by mid-2016.**
 
 * **License:** MIT/X11
-* **Documentation:** <http://sjl.bitbucket.org/bones/>
-* **Mercurial:** <http://bitbucket.org/sjl/bones/>
-* **Git:** <http://github.com/sjl/bones/>
-* **Issues:** <http://github.com/sjl/bones/issues/>
+* **Documentation:** <http://sjl.bitbucket.org/temperance/>
+* **Mercurial:** <http://bitbucket.org/sjl/temperance/>
+* **Git:** <http://github.com/sjl/temperance/>
+* **Issues:** <http://github.com/sjl/temperance/issues/>
 
 ![I don't know what that means](https://i.imgur.com/EWPGAHa.gif)
 
--- a/bones.asd	Sat Aug 20 22:06:27 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-(asdf:defsystem #:bones
-  :name "bones"
-  :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"
-
-  :depends-on (#:trivial-types
-               #:cl-arrows
-               #:policy-cond)
-
-  :in-order-to ((asdf:test-op (asdf:test-op #:bones-test)))
-
-  :serial t
-  :components ((:module "vendor"
-                :serial t
-                :components ((:file "quickutils")))
-               (:file "package")
-               (:module "src"
-                :serial t
-                :components
-                ((:file "utils")
-                 (:file "circle")
-                 (:file "constants")
-                 (:file "types")
-                 (:file "bytecode")
-                 (:file "wam")
-                 (:module "compiler"
-                  :serial t
-                  :components ((:file "0-data")
-                               (:file "1-parsing")
-                               (:file "2-register-allocation")
-                               (:file "3-flattening")
-                               (:file "4-tokenization")
-                               (:file "5-precompilation")
-                               (:file "6-optimization")
-                               (:file "7-rendering")
-                               (:file "8-ui")))
-                 (:file "vm")
-                 (:file "dump")
-                 (:file "ui")
-                 (:file "bones")))))
-
-(asdf:defsystem #:bones-test
-  :name "bones-test"
-  :description "Test suite for bones."
-
-  :author "Steve Losh <steve@stevelosh.com>"
-  :license "MIT/X11"
-
-  :depends-on (#:bones
-               #:1am)
-
-  :perform (asdf:test-op
-             (op system)
-             (uiop:symbol-call :bones-test :run-tests))
-
-  :serial t
-  :components ((:file "package-test")
-               (:module "test"
-                :serial t
-                :components ((:file "bones")
-                             (:file "utils")
-                             (:file "circle")
-                             (:file "wam")
-                             (:file "99")
-                             (:file "taop")))))
--- a/docs/api.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/docs/api.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,13 +1,13 @@
 (ql:quickload "cl-d-api")
 
 (defparameter *document-packages*
-  (list "BONES.WAM"))
+  (list "TEMPERANCE.WAM"))
 
 (defparameter *output-path*
   #p"docs/03-reference.markdown" )
 
 (defparameter *header*
-  "The following is a list of all user-facing parts of Bones.
+  "The following is a list of all user-facing parts of Temperance.
 
 If there are backwards-incompatible changes to anything listed here, they will
 be noted in the changelog and the author will feel bad.
@@ -18,7 +18,7 @@
 ")
 
 (d-api:generate-documentation
-  :bones
+  :temperance
   *output-path*
   *document-packages*
   *header*)
--- a/docs/index.markdown	Sat Aug 20 22:06:27 2016 +0000
+++ b/docs/index.markdown	Sat Aug 20 22:25:47 2016 +0000
@@ -1,13 +1,13 @@
-Bones is a logic programming library for Common Lisp.
+Temperance is a logic programming library for Common Lisp.
 
-**Bones is still in development, don't actually try to use this for anything
-yet.  It should be usable by mid-2016.**
+**Temperance is still in development, don't actually try to use this for
+anything yet.  It should be usable by mid-2016.**
 
 * **License:** MIT/X11
-* **Documentation:** <http://sjl.bitbucket.org/bones/>
-* **Mercurial:** <http://bitbucket.org/sjl/bones/>
-* **Git:** <http://github.com/sjl/bones/>
-* **Issues:** <http://github.com/sjl/bones/issues/>
+* **Documentation:** <http://sjl.bitbucket.org/temperance/>
+* **Mercurial:** <http://bitbucket.org/sjl/temperance/>
+* **Git:** <http://github.com/sjl/temperance/>
+* **Issues:** <http://github.com/sjl/temperance/issues/>
 
 <img src="https://i.imgur.com/EWPGAHa.gif"
      style="border: 1px solid #222; margin: 15px 0px 10px; width: 100%;"/>
--- a/docs/title	Sat Aug 20 22:06:27 2016 +0000
+++ b/docs/title	Sat Aug 20 22:25:47 2016 +0000
@@ -1,1 +1,1 @@
-Bones
+Temperance
--- a/package-test.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/package-test.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,12 +1,12 @@
-(defpackage #:bones-test
+(defpackage #:temperance-test
   (:use #:cl #:1am))
 
-(defpackage #:bones-test.utils
+(defpackage #:temperance-test.utils
   (:use
     #:cl
     #:1am
-    #:bones.wam
-    #:bones.quickutils)
+    #:temperance.wam
+    #:temperance.quickutils)
   (:export
     #:fail
     #:empty
@@ -20,14 +20,14 @@
     #:%append
     #:%member))
 
-(defpackage #:bones-test.wam
+(defpackage #:temperance-test.wam
   (:use
     #:cl
     #:1am
-    #:bones-test.utils
-    #:bones.quickutils
-    #:bones.wam)
-  (:import-from #:bones.wam
+    #:temperance-test.utils
+    #:temperance.quickutils
+    #:temperance.wam)
+  (:import-from #:temperance.wam
     #:with-database
     #:make-database
     #:with-fresh-database
@@ -42,14 +42,14 @@
     #:query
     #:query-all))
 
-(defpackage #:bones-test.99
+(defpackage #:temperance-test.99
   (:use
     #:cl
     #:1am
-    #:bones-test.utils
-    #:bones.quickutils
-    #:bones.wam)
-  (:import-from #:bones.wam
+    #:temperance-test.utils
+    #:temperance.quickutils
+    #:temperance.wam)
+  (:import-from #:temperance.wam
     #:with-fresh-database
     #:push-logic-frame-with
     #:rule
@@ -62,14 +62,14 @@
     #:query
     #:query-all))
 
-(defpackage #:bones-test.taop
+(defpackage #:temperance-test.taop
   (:use
     #:cl
     #:1am
-    #:bones-test.utils
-    #:bones.quickutils
-    #:bones.wam)
-  (:import-from #:bones.wam
+    #:temperance-test.utils
+    #:temperance.quickutils
+    #:temperance.wam)
+  (:import-from #:temperance.wam
     #:with-fresh-database
     #:push-logic-frame-with
     #:rule
@@ -82,9 +82,9 @@
     #:query
     #:query-all))
 
-(defpackage #:bones-test.circle
+(defpackage #:temperance-test.circle
   (:use
     #:cl
     #:1am
-    #:bones-test.utils
-    #:bones.circle))
+    #:temperance-test.utils
+    #:temperance.circle))
--- a/package.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/package.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,8 +1,8 @@
-(defpackage #:bones.utils
+(defpackage #:temperance.utils
   (:use
     #:cl
     #:cl-arrows
-    #:bones.quickutils)
+    #:temperance.quickutils)
   (:export
     #:push-if-new
     #:recursively
@@ -21,7 +21,7 @@
     #:queue-empty-p
     #:queue-append))
 
-(defpackage #:bones.circle
+(defpackage #:temperance.circle
   (:use #:cl)
   (:export
     #:circle
@@ -55,13 +55,13 @@
     #:circle-insert-beginning
     #:circle-insert-end))
 
-(defpackage #:bones.wam
+(defpackage #:temperance.wam
   (:use
     #:cl
     #:cl-arrows
-    #:bones.circle
-    #:bones.quickutils
-    #:bones.utils)
+    #:temperance.circle
+    #:temperance.quickutils
+    #:temperance.utils)
   (:export
     #:make-database
     #:reset-database
@@ -99,8 +99,8 @@
     #:?
     #:!))
 
-(defpackage #:bones
-  (:use #:cl #:bones.wam)
+(defpackage #:temperance
+  (:use #:cl #:temperance.wam)
   (:export
     #:make-database
     #:with-database
--- a/src/bones.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-(in-package #:bones)
-
-(defun hello ()
-  1)
-
-
--- a/src/bytecode.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/bytecode.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 
 ;;;; Opcodes
--- a/src/circle.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/circle.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.circle)
+(in-package #:temperance.circle)
 
 ;;;; Circular, Doubly-Linked Lists
 ;;; If you found this through a Google search or a link or something, turn back
--- a/src/compiler/0-data.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/0-data.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; .-,--.      .
 ;;;; ' |   \ ,-. |- ,-.
--- a/src/compiler/1-parsing.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/1-parsing.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; .-,--.
 ;;;;  '|__/ ,-. ,-. ,-. . ,-. ,-.
--- a/src/compiler/2-register-allocation.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/2-register-allocation.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; .-,--.               .               ,.   .  .              .
 ;;;;  `|__/ ,-. ,-. . ,-. |- ,-. ,-.     / |   |  |  ,-. ,-. ,-. |- . ,-. ,-.
--- a/src/compiler/3-flattening.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/3-flattening.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; .-,--' .      .  .
 ;;;;  \|__  |  ,-. |- |- ,-. ,-. . ,-. ,-.
--- a/src/compiler/4-tokenization.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/4-tokenization.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; ,--,--'  .                     .
 ;;;; `- | ,-. | , ,-. ,-. . ,_, ,-. |- . ,-. ,-.
--- a/src/compiler/5-precompilation.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/5-precompilation.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; .-,--.                             .      .
 ;;;;  '|__/ ,-. ,-. ,-. ,-. ,-,-. ,-. . |  ,-. |- . ,-. ,-.
--- a/src/compiler/6-optimization.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/6-optimization.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; ,,--.     .                    .
 ;;;; |`, | ,-. |- . ,-,-. . ,_, ,-. |- . ,-. ,-.
--- a/src/compiler/7-rendering.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/7-rendering.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; .-,--.           .
 ;;;;  `|__/ ,-. ,-. ,-| ,-. ,-. . ,-. ,-.
--- a/src/compiler/8-ui.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/compiler/8-ui.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; ,-.  .                 ,-_/     .
 ;;;;   |  |   ,-. ,-. ,-.   '  | ,-. |- ,-. ,-. ," ,-. ,-. ,-.
--- a/src/constants.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/constants.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 (defmacro define-constants (count-symbol &rest symbols)
   `(progn
--- a/src/dump.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/dump.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 (defun heap-debug (wam address indent-p)
   (format
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/temperance.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -0,0 +1,6 @@
+(in-package #:temperance)
+
+(defun hello ()
+  1)
+
+
--- a/src/types.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/types.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ; (deftype cell-type () ; todo: pick one of these...
 ;   `(integer 0 ,(1- +number-of-cell-types+)))
--- a/src/ui.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/ui.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 
 ;;;; Database
--- a/src/utils.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/utils.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.utils)
+(in-package #:temperance.utils)
 
 (defmacro push-if-new (thing place
                        &environment env
--- a/src/vm.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/vm.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; Config
 (defvar *step* nil)
--- a/src/wam.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/src/wam.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones.wam)
+(in-package #:temperance.wam)
 
 ;;;; WAM
 (defun allocate-wam-code (size)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/temperance.asd	Sat Aug 20 22:25:47 2016 +0000
@@ -0,0 +1,70 @@
+(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"
+
+  :depends-on (#:trivial-types
+               #:cl-arrows
+               #:policy-cond)
+
+  :in-order-to ((asdf:test-op (asdf:test-op #:temperance-test)))
+
+  :serial t
+  :components ((:module "vendor"
+                :serial t
+                :components ((:file "quickutils")))
+               (:file "package")
+               (:module "src"
+                :serial t
+                :components
+                ((:file "utils")
+                 (:file "circle")
+                 (:file "constants")
+                 (:file "types")
+                 (:file "bytecode")
+                 (:file "wam")
+                 (:module "compiler"
+                  :serial t
+                  :components ((:file "0-data")
+                               (:file "1-parsing")
+                               (:file "2-register-allocation")
+                               (:file "3-flattening")
+                               (:file "4-tokenization")
+                               (:file "5-precompilation")
+                               (:file "6-optimization")
+                               (:file "7-rendering")
+                               (: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")))))
--- a/test/99.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/test/99.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones-test.99)
+(in-package #:temperance-test.99)
 
 ;;;; 99 Prolog Problems
 ;;; http://www.ic.unicamp.br/~meidanis/courses/mc336/2009s2/prolog/problemas/
--- a/test/bones.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-(in-package #:bones-test)
-
-(defun run-tests ()
-  (1am:run))
--- a/test/circle.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/test/circle.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones-test.circle)
+(in-package #:temperance-test.circle)
 
 (defmacro is-circle-contents (circle values)
   `(is (equal ,values
--- a/test/run.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/test/run.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -5,13 +5,13 @@
 (let ((*standard-output* (make-broadcast-stream))
       ; (*error-output* (make-broadcast-stream))
       )
-  (ql:quickload 'bones)
+  (ql:quickload 'temperance)
   ;; Recompile to ensure we get the right optimize declarations...
-  (asdf:load-system 'bones :force t)
-  (ql:quickload 'bones-test))
+  (asdf:load-system 'temperance :force t)
+  (ql:quickload 'temperance-test))
 
 (time (prog1
-          (asdf:test-system 'bones)
+          (asdf:test-system 'temperance)
         (terpri)))
 (terpri)
 (quit)
--- a/test/taop.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/test/taop.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones-test.taop)
+(in-package #:temperance-test.taop)
 
 ;; Examples and exercises from The Art of Prolog
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/temperance.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -0,0 +1,4 @@
+(in-package #:temperance-test)
+
+(defun run-tests ()
+  (1am:run))
--- a/test/utils.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/test/utils.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones-test.utils)
+(in-package #:temperance-test.utils)
 
 
 ;;;; Utils
--- a/test/wam.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/test/wam.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -1,4 +1,4 @@
-(in-package #:bones-test.wam)
+(in-package #:temperance-test.wam)
 
 ;;;; Setup
 (defun make-test-database ()
--- a/vendor/make-quickutils.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/vendor/make-quickutils.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -20,6 +20,6 @@
                :alist-plist
                :equivalence-classes
                :map-product)
-  :package "BONES.QUICKUTILS")
+  :package "TEMPERANCE.QUICKUTILS")
 
 (quit)
--- a/vendor/quickutils.lisp	Sat Aug 20 22:06:27 2016 +0000
+++ b/vendor/quickutils.lisp	Sat Aug 20 22:25:47 2016 +0000
@@ -2,15 +2,15 @@
 ;;;; See http://quickutil.org for details.
 
 ;;;; To regenerate:
-;;;; (qtlc:save-utils-as "quickutils.lisp" :utilities '(:DEFINE-CONSTANT :SET-EQUAL :CURRY :RCURRY :SWITCH :ENSURE-BOOLEAN :WHILE :UNTIL :TREE-MEMBER-P :WITH-GENSYMS :ONCE-ONLY :ZIP :ALIST-TO-HASH-TABLE :MAP-TREE :WEAVE :ALIST-PLIST :EQUIVALENCE-CLASSES :MAP-PRODUCT) :ensure-package T :package "BONES.QUICKUTILS")
+;;;; (qtlc:save-utils-as "quickutils.lisp" :utilities '(:DEFINE-CONSTANT :SET-EQUAL :CURRY :RCURRY :SWITCH :ENSURE-BOOLEAN :WHILE :UNTIL :TREE-MEMBER-P :WITH-GENSYMS :ONCE-ONLY :ZIP :ALIST-TO-HASH-TABLE :MAP-TREE :WEAVE :ALIST-PLIST :EQUIVALENCE-CLASSES :MAP-PRODUCT) :ensure-package T :package "TEMPERANCE.QUICKUTILS")
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (unless (find-package "BONES.QUICKUTILS")
-    (defpackage "BONES.QUICKUTILS"
+  (unless (find-package "TEMPERANCE.QUICKUTILS")
+    (defpackage "TEMPERANCE.QUICKUTILS"
       (:documentation "Package that contains Quickutil utility functions.")
       (:use #:cl))))
 
-(in-package "BONES.QUICKUTILS")
+(in-package "TEMPERANCE.QUICKUTILS")
 
 (when (boundp '*utilities*)
   (setf *utilities* (union *utilities* '(:DEFINE-CONSTANT :SET-EQUAL