# HG changeset patch # User Steve Losh # Date 1471957801 0 # Node ID 38d5c4302e124f19135fb4e4f5ed6a5a8428a669 # Parent b1333b02f86893a75c3914e5dedde2beacad57ed Rename `*database*` -> `*standard-database*` diff -r b1333b02f868 -r 38d5c4302e12 src/ui.lisp --- a/src/ui.lisp Sat Aug 20 22:45:16 2016 +0000 +++ b/src/ui.lisp Tue Aug 23 13:10:01 2016 +0000 @@ -2,18 +2,18 @@ ;;;; Database -(defvar *database* nil) +(defvar *standard-database* nil) (defun make-database () (make-wam)) (defun reset-database () - (setf *database* (make-database))) + (setf *standard-database* (make-database))) (defmacro with-database (database &body body) - `(let ((*database* ,database)) + `(let ((*standard-database* ,database)) ,@body)) (defmacro with-fresh-database (&body body) @@ -40,8 +40,8 @@ ;;;; Assertion (defun invoke-rule (head &rest body) - (assert *database* (*database*) "No database.") - (wam-logic-frame-add-clause! *database* + (assert *standard-database* (*standard-database*) "No database.") + (wam-logic-frame-add-clause! *standard-database* (list* (normalize-term head) (mapcar #'normalize-term body))) nil) @@ -68,16 +68,16 @@ ;;;; Logic Frames (defun push-logic-frame () - (assert *database* (*database*) "No database.") - (wam-push-logic-frame! *database*)) + (assert *standard-database* (*standard-database*) "No database.") + (wam-push-logic-frame! *standard-database*)) (defun pop-logic-frame () - (assert *database* (*database*) "No database.") - (wam-pop-logic-frame! *database*)) + (assert *standard-database* (*standard-database*) "No database.") + (wam-pop-logic-frame! *standard-database*)) (defun finalize-logic-frame () - (assert *database* (*database*) "No database.") - (wam-finalize-logic-frame! *database*)) + (assert *standard-database* (*standard-database*) "No database.") + (wam-finalize-logic-frame! *standard-database*)) (defmacro push-logic-frame-with (&body body) `(prog2 @@ -88,13 +88,13 @@ ;;;; Querying (defun perform-aot-query (code size vars result-function) - (assert *database* (*database*) "No database.") - (run-aot-compiled-query *database* code size vars + (assert *standard-database* (*standard-database*) "No database.") + (run-aot-compiled-query *standard-database* code size vars :result-function result-function)) (defun perform-query (terms result-function) - (assert *database* (*database*) "No database.") - (run-query *database* (mapcar #'normalize-term terms) + (assert *standard-database* (*standard-database*) "No database.") + (run-query *standard-database* (mapcar #'normalize-term terms) :result-function result-function)) @@ -219,15 +219,15 @@ ;;;; Debugging (defun dump (&optional full-code) - (dump-wam-full *database*) + (dump-wam-full *standard-database*) (when full-code - (dump-wam-code *database*))) + (dump-wam-code *standard-database*))) (defmacro bytecode (&body body) `(with-fresh-database (push-logic-frame-with ,@body) (format t ";;;; PROGRAM CODE =======================~%") - (dump-wam-code *database*) + (dump-wam-code *standard-database*) (format t "~%;;;; QUERY CODE =========================~%") - (dump-wam-query-code *database*))) + (dump-wam-query-code *standard-database*)))