finished tests for buf.scm

diff --git a/source/buf.scm b/source/buf.scm
index bd003a479c147a95d01cbf7a2f9f2afc17b481c8..6bc30e3976bc51d9d6f000beec5dd0e7b269ebbd 100644 (file)
--- a/source/buf.scm
+++ b/source/buf.scm
@@ -36,13 +36,17 @@
 
 (define (buf-fill! b n)
   (let loop ((i 0))
-    (buf-data-set!
-      (vector-append (buf-data b) ((buf-ldfn b) (buf-src b))))
-    (if (< i n) (loop (+ i 1)))))
+    (if (< i n)
+      (begin
+        (buf-data-set! b
+          (vector-append
+            (buf-data b)
+            (vector ((buf-ldfn b) (buf-src b)))))
+        (loop (+ i 1))))))
 
 (define (buf-sync! b n)
   (let* ((pos     (buf-pos b))
-         (size    (length (buf-data)))
+         (size    (vector-length (buf-data b)))
          (nxt_idx (- (+ pos n) 1))
          (max_idx (- size 1)))
     (if (= size 0)
@@ -51,19 +55,19 @@
         (buf-fill! b (- nxt_idx max_idx))))))
 
 (define (buf-lookahead! b n)
-  (buf-sync b n)
+  (buf-sync! b n)
   (vector-ref
     (buf-data b)
     (- (+ (buf-pos b) n) 1)))
 
-(define (buf-consume! b n)
+(define (buf-consume! b)
   (buf-advance! b)
   (if
     (and
-      (= (buf-pos b) (length (buf-data b)))
+      (= (buf-pos b) (vector-length (buf-data b)))
       (not (buf-marked? b)))
     (begin
-      (buf-pos-set! 0)
-      (buf-data-set! (vector))))
-  (buf-sync! b1))
+      (buf-pos-set! b 0)
+      (buf-data-set! b (vector))))
+  (buf-sync! b 1))
 

diff --git a/tests/test_buf.scm b/tests/test_buf.scm
index 54be893b273339207867c8412393c626e31eb9b8..d52bfb3d29b221330fd9f495dfdea6fccf610012 100644 (file)
--- a/tests/test_buf.scm
+++ b/tests/test_buf.scm
@@ -1,6 +1,7 @@
 (include "test.scm")
 (declare (unit test_buf)
          (uses buf)
+         (uses ports)
          (uses test))
 
 ; buf
@@ -122,26 +123,124 @@
 
 ; buf-fill!
 ;------------------------------------------------------------------------------
-(def-test "buf-fill! should load 0 items from the source" '())
-(def-test "buf-fill! should load 1 items from the source" '())
-(def-test "buf-fill! should load 2 items from the source" '())
-(def-test "buf-fill! should load 3 items from the source" '())
+(def-test "buf-fill! should load 0 items from the source"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-fill! buffer 0)
+      (equal?
+        (vector)
+        (buf-data buffer)))))
+
+(def-test "buf-fill! should load 1 items from the source"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-fill! buffer 1)
+      (equal?
+        (vector #\a)
+        (buf-data buffer)))))
+
+(def-test "buf-fill! should load 2 items from the source"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-fill! buffer 2)
+      (equal?
+        (vector #\a #\b)
+        (buf-data buffer)))))
+
+(def-test "buf-fill! should load 3 items from the source"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-fill! buffer 3)
+      (equal?
+        (vector #\a #\b #\c)
+        (buf-data buffer)))))
 
 ; buf-sync!
 ;------------------------------------------------------------------------------
-(def-test "buf-sync! should fill the buffer with the specified number of items when the buffer is empty" '())
-(def-test "buf-sync! should fill the buffer up to n when the buffer contains less data than required" '())
-(def-test "buf-sync! should do nothing if already synced" '())
+(def-test "buf-sync! should fill the buffer with the specified number of items when the buffer is empty"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-sync! buffer 3)
+      (equal?
+        (vector #\a #\b #\c)
+        (buf-data buffer)))))
+
+(def-test "buf-sync! should fill the buffer up to n when the buffer contains less data than required"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-data-set! buffer (vector #\z))
+      (buf-sync! buffer 3)
+      (equal?
+        (vector #\z #\a #\b)
+        (buf-data buffer)))))
+
+(def-test "buf-sync! should do nothing if already synced"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-data-set! buffer (vector #\a #\b #\c))
+      (buf-sync! buffer 3)
+      (equal?
+        (vector #\a #\b #\c)
+        (buf-data buffer)))))
 
 ; buf-lookahead!
 ;------------------------------------------------------------------------------
-(def-test "buf-lookahead! should return the first item of lookahead" '())
-(def-test "buf-lookahead! should return the second item of lookahead" '())
-(def-test "buf-lookahead! should return the third item of lookahead" '())
+(def-test "buf-lookahead! should return the first item of lookahead"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (char=? #\a (buf-lookahead! buffer 1)))))
+
+(def-test "buf-lookahead! should return the second item of lookahead"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (char=? #\b (buf-lookahead! buffer 2)))))
+
+(def-test "buf-lookahead! should return the third item of lookahead"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (char=? #\c (buf-lookahead! buffer 3)))))
 
 ; buf-consume!
 ;------------------------------------------------------------------------------
-(def-test "buf-consume! should clear the buffer if not marked and pos is equal to the buffer size" '())
-(def-test "buf-consume! should NOT clear the buffer if pos not equal to the buffer size" '())
-(def-test "buf-consume! should NOT clear the buffer if the buffer is marked" '())
+(def-test "buf-consume! should clear the buffer if not marked and pos is equal to the buffer size"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-sync! buffer 3)
+      (buf-pos-set! buffer 2)
+      (buf-consume! buffer)
+      (and (= 0 (buf-pos buffer))
+           (= 1 (vector-length (buf-data buffer)))))))
+
+(def-test "buf-consume! should NOT clear the buffer if pos not equal to the buffer size"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-sync! buffer 3)
+      (buf-pos-set! buffer 1)
+      (buf-consume! buffer)
+      (and (= 2 (buf-pos buffer))
+           (= 3 (vector-length (buf-data buffer)))))))
+
+(def-test "buf-consume! should NOT clear the buffer if the buffer is marked"
+  (call-with-input-string "abcdef"
+    (lambda (input)
+      (define buffer (buf input read-char))
+      (buf-sync! buffer 3)
+      (buf-pos-set! buffer 2)
+      (buf-mark! buffer)
+      (buf-consume! buffer)
+      (and (= 3 (buf-pos buffer))
+           (= 4 (vector-length (buf-data buffer)))))))
+