Changeset 12070 in project

Timestamp:

10/01/08 06:17:43 (12 years ago)

Author:

Ivan Raikov

Message:

Switched to using matchable.

Location:

release/3/digraph/trunk

Files:

• digraph-eggdoc.scm (modified) (2 diffs)
• digraph.meta (modified) (1 diff)
• digraph.scm (modified) (5 diffs)
• digraph.setup (modified) (1 diff)

release/3/digraph/trunk/digraph-eggdoc.scm

@@ -9 +9 @@
 
      (history 
+      (version "1.10" "Now using matchable extension")
       (version "1.9" "Added procedures pred-list and succ-list")
       (version "1.8" "Added procedure node-info-set!")
@@ -20 +21 @@
       (version "1.0" "Initial release"))
 
-     (requires (url "dyn-vector.html" "dyn-vector"))
+     (requires (url "dyn-vector.html" "dyn-vector")
+               (url "syntax-case.html" "syntax-case")
+               (url "matchable.html" "matchable"))
 
      (usage "(require-extension digraph)")

release/3/digraph/trunk/digraph.meta

@@ -16 +16 @@
  ; A list of eggs digraph depends on.
 
- (needs testbase eggdoc dyn-vector)
+ (needs testbase eggdoc dyn-vector syntax-case matchable)
 
  (eggdoc "digraph-eggdoc.scm")

release/3/digraph/trunk/digraph.scm

@@ -25 +25 @@
 (require-extension srfi-1)
 (require-extension dyn-vector)
+(require-extension syntax-case)
+(require-extension matchable)
 
 (define-extension digraph)
@@ -67 +69 @@
 
   (define (get-nodes)
-    (dynvector-fold 
-     (lambda (i st v) (case v ((none) st) (else (cons (list i v) st)))) 
+    (dynvector-fold (lambda (i st v) (if (eq? 'none v)  st  (cons (list i v) st)))
      (list) nodes))
 
@@ -84 +85 @@
 
   (define (add-node! i info)
-    (case (dynvector-ref nodes i)
-      ((none) (set! node-count (fx+ 1 node-count))))
+    (if (eq? 'none (dynvector-ref nodes i))
+        (set! node-count (fx+ 1 node-count)))
     (dynvector-set! nodes i info))
 
@@ -152 +153 @@
 
   (define (remove-node! i)
-    (case (dynvector-ref nodes i)
-      ((none))
-      (else    (begin
-                 (set-out-edges! i (list))
-                 (set-in-edges! i  (list))
-                 (dynvector-set! nodes i 'none)
-                 (set! node-count (fx- node-count 1))
-                 (set! garbage-nodes (cons i garbage-nodes))
-                 (void)))))
+    (if (not (eq? 'none (dynvector-ref nodes i)))
+        (begin
+          (set-out-edges! i (list))
+          (set-in-edges! i  (list))
+          (dynvector-set! nodes i 'none)
+          (set! node-count (fx- node-count 1))
+          (set! garbage-nodes (cons i garbage-nodes))
+          (void))))
   
   (define (remove-nodes! ns) (for-each remove-node! ns))
@@ -178 +178 @@
                                   (dynvector-ref succ i)))
   
-  (define (has-node n)       (case (dynvector-ref nodes n)
-                               ((none)  #f)
-                               (else #t)))
+  (define (has-node n)       (not (eq? 'none (dynvector-ref nodes n))))
 
   (define (node-info n)      (let ((info (dynvector-ref nodes n)))
-                               (case info
-                                 ((none)  #f)
-                                 (else    info))))
+                               (and (not (eq? 'none info)) info)))
 
   (define (node-info-set! n v)   (dynvector-set! nodes n v))
 
 
-  (define (foreach-node f)   (dynvector-for-each (lambda (i x) (case x  ((none)) (else  (f i x)))) nodes))
+  (define (foreach-node f)   (dynvector-for-each (lambda (i x) (if (not (eq? 'none x))  (f i x)))
+                                                 nodes))
+
   (define (foreach-edge f)   (dynvector-for-each f succ))
 

release/3/digraph/trunk/digraph.setup

@@ -21 +21 @@
 
   ; Assoc list with properties for your extension:
-  `((version 1.9)
+  `((version 1.10)
     (documentation "digraph.html")
     ,@(if has-exports? `((exports "digraph.exports")) (list)) ))