Changeset 39733 in project

Timestamp:

03/17/21 01:54:57 (5 weeks ago)

Author:

Kon Lovett

Message:

set limited-cursor in cont

File:

• release/5/mailbox/trunk/inline-queue.scm (modified) (7 diffs)

release/5/mailbox/trunk/inline-queue.scm

@@ -6 +6 @@
 ;; - Uses (chicken fixnum) & (only record-variants define-record-type-variant)
 
-(define-inline (fxabs n) (if (fx< n 0) (fxneg n) n))
+(define-inline (fxneg? n) (fx< n 0))
+(define-inline (fxabs n) (if (fxneg? n) (fxneg n) n))
 
 ;; Queue Unlimited
@@ -135 +136 @@
 ;; Queue Limited
 
+;circular buffer: s <= e: s = e -> empty, |e - s| = n -> full, s < e -> some
+;
+; inc i: (i + 1)      mod n
+; dec i: (i + (n-1))  mod n
+
 ;the identifier needs to be defined by somebody
 (define queue-limited 'queue-limited)
@@ -145 +151 @@
 
 (define-inline (%make-empty-queue-limited lm)
-  (%make-queue-limited (make-vector (fx+ lm 1) (void)) 0 0) )
-
-;circular buffer: s <= e: s = e -> empty, |e - s| = n -> full, s < e -> some
-;
-; inc i: (i + 1)      mod n
-; dec i: (i + (n-1))  mod n
+  ;limit of 2 is lower-bound otherwise always s = e!
+  ;limit + 1 so
+  (%make-queue-limited (make-vector (fx+ (fxmax 2 lm) 1) (void)) 0 0) )
 
 (define-inline (%queue-limited-peek q i)    (vector-ref (%queue-limited-vector q) i))
@@ -158 +161 @@
   (fx- (vector-length (%queue-limited-vector q)) 1) )
 
+(define-inline (%queue-limited-limit-set! q v)
+  (error '%queue-limited-limit-set! "immutable" v) )
+
 (define-inline (%queue-limited-index-inc q i)
   (fxmod (fx+ i 1) (%queue-limited-limit q)) )
 
 (define-inline (%queue-limited-index-dec q i)
-  (fxmod (fx+ i (fx- (vector-length (%queue-limited-vector q)) 1)) (%queue-limited-limit q)) )
+  (fxmod (fx+ i (fx- (%queue-limited-limit q) 1)) (%queue-limited-limit q)) )
 
 (define-inline (%queue-limited-start-inc! q)
@@ -175 +181 @@
 (define-inline (%queue-limited-end-dec! q)
   (%queue-limited-end-set! q (%queue-limited-index-dec q (%queue-limited-end q))) )
-
-(define-inline (%queue-limited-limit-set! q v)
-  (error '%queue-limited-limit-set! "immutable" v) )
 
 (define-inline (%queue-limited-count q)
@@ -217 +220 @@
         (loop i-1 (cdr ls)) ) ) ) )
 
-;index
 (define-inline (%make-queue-limited-cursor) (cons -1 (void)))
 (define-inline (%queue-limited-cursor? c) (pair? c))
@@ -243 +245 @@
 
 (define-inline (%queue-limited-cursor-continue! q c)
+  ;#; ;assert index is end - 1
+  (%queue-limited-cursor-index-set! c
+    (%queue-limited-index-dec q (%queue-limited-cursor-index c)))
   #; ;assert index is end - 1
   (%queue-limited-cursor-index-set! c
-    (%queue-limited-index-dec q (%queue-limited-end q)))
-  (void) )
+    (%queue-limited-index-dec q (%queue-limited-end q))) )
 
 (define-inline (%queue-limited-cursor-rewind! q c)