# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1486642923 0
# Node ID fd638982ad83b7cf5c2706c7906f161d8a679cb6
# Parent  95495223e6c1be5a1bd6ae943a4607f462dc8b23
Memory is cheap

diff -r 95495223e6c1 -r fd638982ad83 contrib/gdl-benchmark/run_paip.ros
--- a/contrib/gdl-benchmark/run_paip.ros	Thu Feb 09 12:17:13 2017 +0000
+++ b/contrib/gdl-benchmark/run_paip.ros	Thu Feb 09 12:22:03 2017 +0000
@@ -31,14 +31,14 @@
 
 
 ;;;; Package ------------------------------------------------------------------
-(defpackage #:temperance.contrib.gdl-benchmark
+(defpackage :temperance.contrib.gdl-benchmark
   (:use
-    #:cl
-    #:losh
-    #:temperance.quickutils
-    #:paiprolog))
+    :cl
+    :losh
+    :temperance.quickutils
+    :paiprolog))
 
-(in-package #:temperance.contrib.gdl-benchmark)
+(in-package :temperance.contrib.gdl-benchmark)
 
 
 ;;;; Config -------------------------------------------------------------------
diff -r 95495223e6c1 -r fd638982ad83 contrib/gdl-benchmark/run_temperance.ros
--- a/contrib/gdl-benchmark/run_temperance.ros	Thu Feb 09 12:17:13 2017 +0000
+++ b/contrib/gdl-benchmark/run_temperance.ros	Thu Feb 09 12:22:03 2017 +0000
@@ -30,15 +30,15 @@
 
 
 ;;;; Package ------------------------------------------------------------------
-(defpackage #:temperance.contrib.gdl-benchmark
+(defpackage :temperance.contrib.gdl-benchmark
   (:use
-    #:cl
-    #:cl-arrows
-    #:losh
-    #:temperance.quickutils
-    #:temperance))
+    :cl
+    :cl-arrows
+    :losh
+    :temperance.quickutils
+    :temperance))
 
-(in-package #:temperance.contrib.gdl-benchmark)
+(in-package :temperance.contrib.gdl-benchmark)
 
 
 ;;;; Config -------------------------------------------------------------------
diff -r 95495223e6c1 -r fd638982ad83 package-test.lisp
--- a/package-test.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/package-test.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,90 +1,90 @@
-(defpackage #:temperance-test
-  (:use #:cl #:1am))
+(defpackage :temperance-test
+  (:use :cl :1am))
 
-(defpackage #:temperance-test.utils
+(defpackage :temperance-test.utils
   (:use
-    #:cl
-    #:1am
-    #:temperance
-    #:temperance.quickutils)
+    :cl
+    :1am
+    :temperance
+    :temperance.quickutils)
   (:export
-    #:fail
-    #:empty
-    #:result=
-    #:results=
-    #:should-fail
-    #:should-return
-    #:define-test
-    #:%=
-    #:%not
-    #:%append
-    #:%member))
+    :fail
+    :empty
+    :result=
+    :results=
+    :should-fail
+    :should-return
+    :define-test
+    :%=
+    :%not
+    :%append
+    :%member))
 
-(defpackage #:temperance-test.wam
+(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))
+    :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
+(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))
+    :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
+(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))
+    :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
+(defpackage :temperance-test.circle
   (:use
-    #:cl
-    #:1am
-    #:temperance-test.utils
-    #:temperance.circle))
+    :cl
+    :1am
+    :temperance-test.utils
+    :temperance.circle))
diff -r 95495223e6c1 -r fd638982ad83 package.lisp
--- a/package.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/package.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,102 +1,102 @@
-(defpackage #:temperance.utils
+(defpackage :temperance.utils
   (:use
-    #:cl
-    #:cl-arrows
-    #:temperance.quickutils)
+    :cl
+    :cl-arrows
+    :temperance.quickutils)
   (:export
-    #:push-if-new
-    #:recursively
-    #:recur
-    #:megabytes
-    #:ecase/tree
-    #:ensure-aref
-    #:define-lookup
-    #:queue
-    #:make-queue
-    #:enqueue
-    #:dequeue
-    #:queue-contents
-    #:queue-empty-p
-    #:queue-append))
+    :push-if-new
+    :recursively
+    :recur
+    :megabytes
+    :ecase/tree
+    :ensure-aref
+    :define-lookup
+    :queue
+    :make-queue
+    :enqueue
+    :dequeue
+    :queue-contents
+    :queue-empty-p
+    :queue-append))
 
-(defpackage #:temperance.circle
-  (:use #:cl)
+(defpackage :temperance.circle
+  (:use :cl)
   (:export
-    #:circle
-    #:make-circle-with
-    #:make-empty-circle
-    #:circle-to-list
-    #:circle-prepend
-    #:circle-prepend-circle
-    #:circle-append
-    #:circle-append-circle
-    #:circle-next
-    #:circle-prev
-    #:circle-forward
-    #:circle-backward
-    #:circle-value
-    #:circle-rotate
-    #:circle-nth
-    #:circle-insert-before
-    #:circle-insert-after
-    #:circle-sentinel-p
-    #:circle-empty-p
-    #:circle-remove
-    #:circle-backward-remove
-    #:circle-forward-remove
-    #:circle-replace
-    #:circle-backward-replace
-    #:circle-forward-replace
-    #:circle-splice
-    #:circle-backward-splice
-    #:circle-forward-splice
-    #:circle-insert-beginning
-    #:circle-insert-end))
+    :circle
+    :make-circle-with
+    :make-empty-circle
+    :circle-to-list
+    :circle-prepend
+    :circle-prepend-circle
+    :circle-append
+    :circle-append-circle
+    :circle-next
+    :circle-prev
+    :circle-forward
+    :circle-backward
+    :circle-value
+    :circle-rotate
+    :circle-nth
+    :circle-insert-before
+    :circle-insert-after
+    :circle-sentinel-p
+    :circle-empty-p
+    :circle-remove
+    :circle-backward-remove
+    :circle-forward-remove
+    :circle-replace
+    :circle-backward-replace
+    :circle-forward-replace
+    :circle-splice
+    :circle-backward-splice
+    :circle-forward-splice
+    :circle-insert-beginning
+    :circle-insert-end))
 
-(defpackage #:temperance
+(defpackage :temperance
   (:use
-    #:cl
-    #:cl-arrows
-    #:temperance.circle
-    #:temperance.quickutils
-    #:temperance.utils)
+    :cl
+    :cl-arrows
+    :temperance.circle
+    :temperance.quickutils
+    :temperance.utils)
   (:export
-    #:make-database
-    #:reset-standard-database
+    :make-database
+    :reset-standard-database
 
-    #:with-database
-    #:with-fresh-database
+    :with-database
+    :with-fresh-database
 
-    #:invoke-rule
-    #:invoke-fact
-    #:invoke-facts
+    :invoke-rule
+    :invoke-fact
+    :invoke-facts
 
-    #:rule
-    #:fact
-    #:facts
+    :rule
+    :fact
+    :facts
 
-    #:push-logic-frame
-    #:pop-logic-frame
-    #:finalize-logic-frame
-    #:push-logic-frame-with
+    :push-logic-frame
+    :pop-logic-frame
+    :finalize-logic-frame
+    :push-logic-frame-with
 
-    #:invoke-query
-    #:invoke-query-all
-    #:invoke-query-map
-    #:invoke-query-for
-    #:invoke-query-do
-    #:invoke-query-find
-    #:invoke-prove
+    :invoke-query
+    :invoke-query-all
+    :invoke-query-map
+    :invoke-query-for
+    :invoke-query-do
+    :invoke-query-find
+    :invoke-prove
 
-    #:query
-    #:query-all
-    #:query-map
-    #:query-for
-    #:query-do
-    #:query-find
-    #:prove
+    :query
+    :query-all
+    :query-map
+    :query-for
+    :query-do
+    :query-find
+    :prove
 
-    #:call
-    #:?
-    #:!))
+    :call
+    :?
+    :!))
 
diff -r 95495223e6c1 -r fd638982ad83 src/bytecode.lisp
--- a/src/bytecode.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/bytecode.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 
 ;;;; Opcodes
diff -r 95495223e6c1 -r fd638982ad83 src/circle.lisp
--- a/src/circle.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/circle.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance.circle)
+(in-package :temperance.circle)
 
 ;;;; Circular, Doubly-Linked Lists
 ;;; If you found this through a Google search or a link or something, turn back
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/0-data.lisp
--- a/src/compiler/0-data.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/0-data.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; .-,--.      .
 ;;;; ' |   \ ,-. |- ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/1-parsing.lisp
--- a/src/compiler/1-parsing.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/1-parsing.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; .-,--.
 ;;;;  '|__/ ,-. ,-. ,-. . ,-. ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/2-register-allocation.lisp
--- a/src/compiler/2-register-allocation.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/2-register-allocation.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; .-,--.               .               ,.   .  .              .
 ;;;;  `|__/ ,-. ,-. . ,-. |- ,-. ,-.     / |   |  |  ,-. ,-. ,-. |- . ,-. ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/3-flattening.lisp
--- a/src/compiler/3-flattening.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/3-flattening.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; .-,--' .      .  .
 ;;;;  \|__  |  ,-. |- |- ,-. ,-. . ,-. ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/4-tokenization.lisp
--- a/src/compiler/4-tokenization.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/4-tokenization.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; ,--,--'  .                     .
 ;;;; `- | ,-. | , ,-. ,-. . ,_, ,-. |- . ,-. ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/5-precompilation.lisp
--- a/src/compiler/5-precompilation.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/5-precompilation.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; .-,--.                             .      .
 ;;;;  '|__/ ,-. ,-. ,-. ,-. ,-,-. ,-. . |  ,-. |- . ,-. ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/6-optimization.lisp
--- a/src/compiler/6-optimization.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/6-optimization.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; ,,--.     .                    .
 ;;;; |`, | ,-. |- . ,-,-. . ,_, ,-. |- . ,-. ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/7-rendering.lisp
--- a/src/compiler/7-rendering.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/7-rendering.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; .-,--.           .
 ;;;;  `|__/ ,-. ,-. ,-| ,-. ,-. . ,-. ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/compiler/8-ui.lisp
--- a/src/compiler/8-ui.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/compiler/8-ui.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; ,-.  .                 ,-_/     .
 ;;;;   |  |   ,-. ,-. ,-.   '  | ,-. |- ,-. ,-. ," ,-. ,-. ,-.
diff -r 95495223e6c1 -r fd638982ad83 src/constants.lisp
--- a/src/constants.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/constants.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 (defmacro define-constants (count-symbol &rest symbols)
   `(progn
diff -r 95495223e6c1 -r fd638982ad83 src/dump.lisp
--- a/src/dump.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/dump.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 (defun heap-debug (wam address indent-p)
   (format
diff -r 95495223e6c1 -r fd638982ad83 src/temperance.lisp
--- a/src/temperance.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/temperance.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 (defun hello ()
   1)
diff -r 95495223e6c1 -r fd638982ad83 src/types.lisp
--- a/src/types.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/types.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ; (deftype cell-type () ; todo: pick one of these...
 ;   `(integer 0 ,(1- +number-of-cell-types+)))
diff -r 95495223e6c1 -r fd638982ad83 src/ui.lisp
--- a/src/ui.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/ui.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 
 ;;;; Database
diff -r 95495223e6c1 -r fd638982ad83 src/vm.lisp
--- a/src/vm.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/vm.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; Config
 (defvar *step* nil)
diff -r 95495223e6c1 -r fd638982ad83 src/wam.lisp
--- a/src/wam.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/src/wam.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance)
+(in-package :temperance)
 
 ;;;; WAM
 (defun allocate-wam-code (size)
diff -r 95495223e6c1 -r fd638982ad83 temperance.asd
--- a/temperance.asd	Thu Feb 09 12:17:13 2017 +0000
+++ b/temperance.asd	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(asdf:defsystem #:temperance
+(asdf:defsystem :temperance
   :name "temperance"
   :description "A logic programming library for Common Lisp."
 
@@ -8,10 +8,10 @@
   :license "MIT/X11"
   :version "0.0.1"
 
-  :depends-on (#:cl-arrows
-               #:policy-cond)
+  :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"
@@ -43,15 +43,15 @@
                  (:file "ui")
                  (:file "temperance")))))
 
-(asdf:defsystem #:temperance-test
+(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)
+  :depends-on (:temperance
+               :1am)
 
   :perform (asdf:test-op
              (op system)
diff -r 95495223e6c1 -r fd638982ad83 test/99.lisp
--- a/test/99.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/test/99.lisp	Thu Feb 09 12:22:03 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/
diff -r 95495223e6c1 -r fd638982ad83 test/circle.lisp
--- a/test/circle.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/test/circle.lisp	Thu Feb 09 12:22:03 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
diff -r 95495223e6c1 -r fd638982ad83 test/taop.lisp
--- a/test/taop.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/test/taop.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance-test.taop)
+(in-package :temperance-test.taop)
 
 ;; Examples and exercises from The Art of Prolog
 
diff -r 95495223e6c1 -r fd638982ad83 test/temperance.lisp
--- a/test/temperance.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/test/temperance.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance-test)
+(in-package :temperance-test)
 
 (defun run-tests ()
   (1am:run))
diff -r 95495223e6c1 -r fd638982ad83 test/utils.lisp
--- a/test/utils.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/test/utils.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance-test.utils)
+(in-package :temperance-test.utils)
 
 
 ;;;; Utils
diff -r 95495223e6c1 -r fd638982ad83 test/wam.lisp
--- a/test/wam.lisp	Thu Feb 09 12:17:13 2017 +0000
+++ b/test/wam.lisp	Thu Feb 09 12:22:03 2017 +0000
@@ -1,4 +1,4 @@
-(in-package #:temperance-test.wam)
+(in-package :temperance-test.wam)
 
 ;;;; Setup
 (defun make-test-database ()