Fix convert rule for 'edge-height.

[lilypond.git] / scm / coverage.scm

diff --git a/scm/coverage.scm b/scm/coverage.scm
index a7a1b2455278121023060245958b63e16f81e399..e7392bb6837b8e5fe459d0001d3a29d2229299e3 100644 (file)
--- a/scm/coverage.scm
+++ b/scm/coverage.scm
@@ -3,28 +3,27 @@
 (use-modules (lily)
             (ice-9 rdelim)
             (ice-9 regex)
-            (ice-9 format))
+            (ice-9 format) ;; needed for ~8@ 
+            )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (coverage:show-all filter?)
-  
+  (let*
+      ((keys
+       (filter filter?
+               (sort (map car (hash-table->alist coverage-table)) string<? ))))
+    
   (newline)
-  (hash-fold
-   (lambda (key val acc)
-     (if (filter? key)
-        (begin
-          (format #t
-                "
-Coverage for file: ~a
-"
-                key)
-        (display-coverage key val
-                          (format #f "~a.cov" (basename key))
-                          )))
-     #t)
-   #t
-   coverage-table))
+  (for-each
+   (lambda (k)
+
+     (format #t "Coverage for file: ~a\n" k)
+     (display-coverage
+      k (hash-ref coverage-table k)
+      (format #f "~a.cov" (basename k))))
+   keys)))
+
 
 (define-public (coverage:enable)
   (trap-set! memoize-symbol-handler record-coverage)
@@ -60,15 +59,10 @@ Coverage for file: ~a
                       (cond
                        ((and (< i (vector-length vec)) (vector-ref vec i)) "1")
                        ((and (string-contains file ".ly") (string-match "^[ \t]*%.*$" (car l)))
-
                         "-")
                        ((string-match  "^[ \t]*[()'`,]*$" (car l))
-
                         "-")
                        ((string-match  "^[ \t]*;.*$" (car l))
-                        (format (current-output-port) "~a l=~a, m=~a\n"
-                                i
-                                (car l) (string-match  "^[ \t]*;.*$"  (car l)))
 
                         "-")
                        (else "0"))
@@ -79,7 +73,7 @@ Coverage for file: ~a
   (let*
       ((name (source-property exp 'filename))
        (line (source-property exp 'line))
-       (vec (and name (hashv-ref coverage-table name #f)))
+       (vec (and name (hash-ref coverage-table name #f)))
        (veclen (and vec (vector-length vec)))
        (veccopy (lambda (src dst)
                  (vector-move-left! src 0 (vector-length src)
@@ -89,7 +83,7 @@ Coverage for file: ~a
        (begin
          (if (or (not vec) (>= line (vector-length vec)))
              (set! vec
-                   (hashv-set! coverage-table name
+                   (hash-set! coverage-table name
                                (if vec
                                    (veccopy vec (make-vector (1+ line) #f))
                                    (make-vector (1+ line) #f)))))