X-Git-Url: https://jxself.org/git/?p=8sync.git;a=blobdiff_plain;f=8sync%2Fsystems%2Factors.scm;h=0ae6e054c0c0eec3ea57f34f9d131f13efb0b023;hp=2d42897a03740c3be374473d192d9b463e289a71;hb=89dfbd6214e8e00bca235fd2974c0b343655d48f;hpb=55bf40bbd2d7cd5f0f14f0e2de28f71dfe1a127e
diff --git a/8sync/systems/actors.scm b/8sync/systems/actors.scm
index 2d42897..0ae6e05 100644
--- a/8sync/systems/actors.scm
+++ b/8sync/systems/actors.scm
@@ -38,7 +38,9 @@
actor-hive
actor-message-handler
-
+ ;;; Commenting out the type for now;
+ ;;; it may be back when we have better serializers
+ ;;
make-address address?
address-actor-id address-hive-id
@@ -108,7 +110,7 @@
;;; =========================
(define-class ()
- ;; An object
+ ;; An address object
(id #:init-thunk (require-slot "id")
#:init-keyword #:id
#:getter actor-id)
@@ -124,17 +126,31 @@
(define-method (actor-message-handler (actor ))
(slot-ref actor 'message-handler))
-(define-record-type
- (make-address actor-id hive-id) ; @@: Do we want the trailing -id?
- address?
- (actor-id address-actor-id)
- (hive-id address-hive-id))
-
-(set-record-type-printer!
-
- (lambda (record port)
- (format port ""
- (address-actor-id record) (address-hive-id record))))
+;;; So these are the nicer representations of addresses.
+;;; However, they don't serialize so easily with scheme read/write, so we're
+;;; using the simpler cons cell version below for now.
+
+;; (define-record-type
+;; (make-address actor-id hive-id) ; @@: Do we want the trailing -id?
+;; address?
+;; (actor-id address-actor-id)
+;; (hive-id address-hive-id))
+;;
+;; (set-record-type-printer!
+;;
+;; (lambda (record port)
+;; (format port ""
+;; (address-actor-id record) (address-hive-id record))))
+;;
+
+(define (make-address actor-id hive-id)
+ (cons actor-id hive-id))
+
+(define (address-actor-id address)
+ (car address))
+
+(define (address-hive-id address)
+ (cdr address))
(define (address->string address)
(string-append (address-actor-id address) "@"