From 4deb5433574cfdf8f2b2bf22460c8b74ba426bed Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 20 Dec 2016 12:11:04 -0600
Subject: [PATCH] actors: Move actors center-stage in 8sync.

* 8sync/systems/actors.scm: Renamed to 8sync/actors.scm.
* 8sync/systems/actors/debug.scm: Renamed to 8sync/debug.scm.
* Makefile.am: Update for renamed files.
* demos/actors/botherbotherbother.scm:
* demos/actors/robotscanner.scm:
* demos/actors/simplest-possible.scm:
* tests/test-actors.scm: Update import of actors module to new location.
---
 8sync/{systems => }/actors.scm       | 4 +---
 8sync/{systems/actors => }/debug.scm | 6 +++---
 Makefile.am                          | 4 ++--
 demos/actors/botherbotherbother.scm  | 2 +-
 demos/actors/robotscanner.scm        | 2 +-
 demos/actors/simplest-possible.scm   | 2 +-
 tests/test-actors.scm                | 4 ++--
 7 files changed, 11 insertions(+), 13 deletions(-)
 rename 8sync/{systems => }/actors.scm (99%)
 rename 8sync/{systems/actors => }/debug.scm (93%)

diff --git a/8sync/systems/actors.scm b/8sync/actors.scm
similarity index 99%
rename from 8sync/systems/actors.scm
rename to 8sync/actors.scm
index eed3930..fdcbc85 100644
--- a/8sync/systems/actors.scm
+++ b/8sync/actors.scm
@@ -16,9 +16,7 @@
 ;;; You should have received a copy of the GNU Lesser General Public
 ;;; License along with 8sync.  If not, see <http://www.gnu.org/licenses/>.
 
-;; XUDD inspired actor system
-
-(define-module (8sync systems actors)
+(define-module (8sync actors)
   #:use-module (oop goops)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-9 gnu)
diff --git a/8sync/systems/actors/debug.scm b/8sync/debug.scm
similarity index 93%
rename from 8sync/systems/actors/debug.scm
rename to 8sync/debug.scm
index 465751c..a05f131 100644
--- a/8sync/systems/actors/debug.scm
+++ b/8sync/debug.scm
@@ -16,9 +16,9 @@
 ;;; You should have received a copy of the GNU Lesser General Public
 ;;; License along with 8sync.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (8sync systems actors debug)
+(define-module (8sync debug)
   #:use-module (oop goops)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:export (hive-resolve-local-actor
             actor-hive
 
@@ -32,7 +32,7 @@
 ;; "private" kind of a misnomer
 (define-syntax-rule (expose private-var)
   (define private-var
-    (@@ (8sync systems actors) private-var)))
+    (@@ (8sync actors) private-var)))
 
 (expose hive-resolve-local-actor)
 (expose actor-hive)
diff --git a/Makefile.am b/Makefile.am
index 654de77..83ab6b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,8 +48,8 @@ SOURCES =  \
 	8sync/agenda.scm \
 	8sync/repl.scm \
 	8sync/systems/irc.scm \
-	8sync/systems/actors.scm \
-	8sync/systems/actors/debug.scm
+	8sync/actors.scm \
+	8sync/debug.scm
 
 TESTS =							\
 	tests/test-agenda.scm				\
diff --git a/demos/actors/botherbotherbother.scm b/demos/actors/botherbotherbother.scm
index 48270f2..356a6a9 100755
--- a/demos/actors/botherbotherbother.scm
+++ b/demos/actors/botherbotherbother.scm
@@ -23,7 +23,7 @@
 ;; Puppet show simulator.
 
 (use-modules (8sync agenda)
-             (8sync systems actors)
+             (8sync actors)
              (oop goops)
              (ice-9 hash-table)
              (ice-9 format))
diff --git a/demos/actors/robotscanner.scm b/demos/actors/robotscanner.scm
index 9ab5765..e8d2cc8 100644
--- a/demos/actors/robotscanner.scm
+++ b/demos/actors/robotscanner.scm
@@ -33,7 +33,7 @@
 ;;; reporting info back to the user.)
 ;;; =====================================================================
 
-(use-modules (8sync systems actors)
+(use-modules (8sync actors)
              (oop goops)
              (ice-9 match))
 
diff --git a/demos/actors/simplest-possible.scm b/demos/actors/simplest-possible.scm
index 8496b92..13aea1c 100644
--- a/demos/actors/simplest-possible.scm
+++ b/demos/actors/simplest-possible.scm
@@ -16,7 +16,7 @@
 ;;; You should have received a copy of the GNU Lesser General Public
 ;;; License along with 8sync.  If not, see <http://www.gnu.org/licenses/>.
 
-(use-modules (8sync systems actors)
+(use-modules (8sync actors)
              (oop goops))
 
 (define-simple-actor <emo>
diff --git a/tests/test-actors.scm b/tests/test-actors.scm
index 6e59198..73927cd 100644
--- a/tests/test-actors.scm
+++ b/tests/test-actors.scm
@@ -18,7 +18,7 @@
 
 (define-module (tests test-actors)
   #:use-module (srfi srfi-64)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (oop goops)
   #:use-module (tests utils))
@@ -68,7 +68,7 @@
      (test-equal (getter test-message) (getter reread-message)))
    (list message-id message-to message-from message-action message-body
          message-in-reply-to message-wants-reply
-         (@@ (8sync systems actors) message-replied))))
+         (@@ (8sync actors) message-replied))))
 
 
 ;;; Test reply / autoreply
-- 
2.31.1