# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1485001837 0
# Node ID 11d761abaa71bfd9b0dbd7ea556cde05bc5c16cd
# Parent  26a5a69dc3f955ab1fef6d0e5c6edd7571259366
Get this thing compiling again after the arrowectomy

diff -r 26a5a69dc3f9 -r 11d761abaa71 package.lisp
--- a/package.lisp	Thu Jan 19 17:02:51 2017 +0000
+++ b/package.lisp	Sat Jan 21 12:30:37 2017 +0000
@@ -3,9 +3,7 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
     :temperance
-    :trivia
     :named-readtables
     :scully.quickutils)
   (:export
@@ -21,7 +19,10 @@
     :rule-head
     :rule-body
     :rule-predicate
-    :rule-head=))
+    :rule-head=)
+  (:import-from :trivia
+    :defun-ematch
+    :defun-match))
 
 
 (defpackage :scully.graphviz
@@ -29,17 +30,17 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
     :trivia
     :trivialib.bdd
-    :scully.quickutils))
+    :scully.quickutils)
+  (:shadowing-import-from :losh
+    :<>))
 
 (defpackage :scully.zdd
   (:use
     :cl
     :losh
     :iterate
-    :cl-arrows
     :hamt
     :trivia
     :trivialib.bdd
@@ -66,15 +67,15 @@
     :zdd-keep-avoiders-of
     :zdd-match)
   (:shadowing-import-from :hamt
-    :hash-set))
+    :hash-set)
+  (:shadowing-import-from :losh
+    :<>))
 
 (defpackage :scully.rule-trees
   (:use
     :cl
     :losh
     :iterate
-    :cl-arrows
-    :trivia
     :named-readtables
     :scully.gdl
     :scully.quickutils)
@@ -85,14 +86,14 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
-    :trivia
     :named-readtables
     :scully.gdl
     :scully.quickutils)
   (:export
     :integerize-rules
-    :stratify-layer))
+    :stratify-layer)
+  (:import-from :trivia
+    :match))
 
 
 (defpackage :scully.reasoners.prolog
@@ -100,7 +101,6 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
     :temperance
     :scully.quickutils)
   (:export
@@ -119,11 +119,12 @@
   (:use
     :cl
     :losh
+    :trivia
     :iterate
-    :trivia
-    :cl-arrows
     :scully.zdd
-    :scully.quickutils))
+    :scully.quickutils)
+  (:shadowing-import-from :losh
+    :<>))
 
 
 (defpackage :scully.grounders.prolog
@@ -132,7 +133,6 @@
     :losh
     :iterate
     :optima
-    :cl-arrows
     :temperance
     :scully.quickutils)
   (:export
@@ -143,7 +143,6 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
     :smug
     :scully.quickutils)
   (:export
@@ -156,7 +155,6 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
     :scully.quickutils
     :scully.reasoners.prolog)
   (:export
@@ -167,7 +165,6 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
     :scully.quickutils
     :scully.reasoners.prolog)
   (:export
diff -r 26a5a69dc3f9 -r 11d761abaa71 scully.asd
--- a/scully.asd	Thu Jan 19 17:02:51 2017 +0000
+++ b/scully.asd	Sat Jan 21 12:30:37 2017 +0000
@@ -19,7 +19,6 @@
                :fare-quasiquote-readtable
                :cl-dot
                :cl-algebraic-data-type
-               :cl-arrows
                :cl-ggp
                :cl-hamt
                :trivia
diff -r 26a5a69dc3f9 -r 11d761abaa71 src/grounders/fluxplayer.lisp
--- a/src/grounders/fluxplayer.lisp	Thu Jan 19 17:02:51 2017 +0000
+++ b/src/grounders/fluxplayer.lisp	Sat Jan 21 12:30:37 2017 +0000
@@ -133,9 +133,9 @@
     (apply #'rebuild-rules)))
 
 (defun ground-gdl-file (filename)
-  (->> (ground-with-fluxplayer "" filename)
+  (-<> (ground-with-fluxplayer "" filename)
     parse-raw-grounded
-    (apply #'rebuild-rules)))
+    (apply #'rebuild-rules <>)))
 
 
 (defun dump-grounded (filename)
diff -r 26a5a69dc3f9 -r 11d761abaa71 src/reasoners/zdd.lisp
--- a/src/reasoners/zdd.lisp	Thu Jan 19 17:02:51 2017 +0000
+++ b/src/reasoners/zdd.lisp	Sat Jan 21 12:30:37 2017 +0000
@@ -414,19 +414,20 @@
 (defparameter *i* (initial-iset *r*))
 (defparameter *j* (initial-iset *r*))
 
-(with-zdd
-  (-<> *r*
-    (make-iset '(
-                 (true (control xplayer))
-                 (true (cell 1 1 B)) (true (cell 1 2 x)) (true (cell 1 3 o))
-                 (true (cell 2 1 B)) (true (cell 2 2 o)) (true (cell 2 3 o))
-                 (true (cell 3 1 x)) (true (cell 3 2 x)) (true (cell 3 3 x))
-                 ))
-    (apply-rule-forest *r* <> (zr-possible-forest *r*))
-    (draw-zdd *r* <>)
-    (dump-iset *r* <>)
-    (no <>)
-    ))
+; (with-zdd
+;   (-<> *r*
+;     (make-iset <>
+;                '(
+;                  (true (control xplayer))
+;                  (true (cell 1 1 B)) (true (cell 1 2 x)) (true (cell 1 3 o))
+;                  (true (cell 2 1 B)) (true (cell 2 2 o)) (true (cell 2 3 o))
+;                  (true (cell 3 1 x)) (true (cell 3 2 x)) (true (cell 3 3 x))
+;                  ))
+;     (apply-rule-forest *r* <> (zr-possible-forest *r*))
+;     (draw-zdd *r* <>)
+;     (dump-iset *r* <>)
+;     (no <>)
+;     ))
 
 
 (defun test ()
diff -r 26a5a69dc3f9 -r 11d761abaa71 src/terms.lisp
--- a/src/terms.lisp	Thu Jan 19 17:02:51 2017 +0000
+++ b/src/terms.lisp	Sat Jan 21 12:30:37 2017 +0000
@@ -324,12 +324,12 @@
            (format t "STRATUM ~D:~%~{    ~S~%~}~2%"
                    i stratum)))
 
-(-<> *rules*
-  (normalize-rules <>)
-  (integerize-rules <>)
-  ; (nth 2 <>)
-  ; (print-strata <>)
-  (no <>)
-  ; (rest <>)
-  ; (map nil #'print-hash-table <>)
-  )
+; (-<> *rules*
+;   (normalize-rules <>)
+;   (integerize-rules <>)
+;   ; (nth 2 <>)
+;   ; (print-strata <>)
+;   (no <>)
+;   ; (rest <>)
+;   ; (map nil #'print-hash-table <>)
+;   )