Changeset 10538 for lang/scheme

Timestamp:

04/27/08 14:18:50 (7 months ago)

Author:

hayamiz

Message:

tokyocabinet bdb passed all tests.

Files:

• lang/scheme/gauche-tokyocabinet/trunk/dbm/tokyocabinet.scm (modified) (2 diffs)

lang/scheme/gauche-tokyocabinet/trunk/dbm/tokyocabinet.scm

@@ -126 +126 @@
     (let1 ret (tcbdb-get2 (raw-tcbdb-of self) key)
       (if ret
-          ret
+          (%dbm-s2v self ret)
           (if (null? args)
               (errorf "tokyocabinet bdb: not data for key ~s in database ~s"
@@ -142 +142 @@
 
 (define-method dbm-fold ((self <tcbdb>) proc knil)
-  (let ((raw-tcbdb (raw-tcbdb-of self)))
-    (if (not raw-tcbdb)
+  (let* ((raw-tcbdb (raw-tcbdb-of self))
+         (cur (tcbdbcur-new raw-tcbdb)))
+    (if (not (tcbdbcur-first cur))
         knil
-        (tcbdb-fold raw-tcbdb proc knil))))
+        (let loop((continue? #t) (ret knil))
+          (if (not continue?)
+              ret
+              (let1 newret (proc (%dbm-s2k self (tcbdbcur-key2 cur))
+                                 (%dbm-s2v self (tcbdbcur-val2 cur))
+                                 ret)
+                (loop (tcbdbcur-next cur) newret)))))))
 
 ;; Epilogue