Revert "Apply scripts/auxiliar/fixscm.sh"

[lilypond.git] / scm / coverage.scm

diff --git a/scm/coverage.scm b/scm/coverage.scm
index 75016517a2b0a1a4c84c549ec2111fcce0c0c352..3c210555ae102bc2f67621e87610d8fa27441818 100644 (file)
--- a/scm/coverage.scm
+++ b/scm/coverage.scm
@@ -3,28 +3,28 @@
 (define-module (scm coverage))
 
 (use-modules (lily)
-             (ice-9 rdelim)
-             (ice-9 regex)
-             (ice-9 format) ;; needed for ~8@
-             )
+            (ice-9 rdelim)
+            (ice-9 regex)
+            (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<? ))))
+       (filter filter?
+               (sort (map car (hash-table->alist coverage-table)) string<? ))))
+    
+  (newline)
+  (for-each
+   (lambda (k)
 
-    (newline)
-    (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)))
+     (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)
@@ -32,7 +32,7 @@
   (trap-enable 'memoize-symbol)
   (trap-enable 'traps))
 
-
+     
 (define-public (coverage:disable)
   (trap-set! memoize-symbol-handler #f)
   (trap-disable 'memoize-symbol))
@@ -49,27 +49,27 @@
       ((lines (read-lines (open-file file "r")))
        (format-str "~8@a: ~5@a:~a\n")
        (out (if out-file (open-output-file out-file)
-                (current-output-port))))
+               (current-output-port))))
 
     (format out format-str "-" 0 (format #f "Source:~a" file))
     (do
-        ((i 0 (1+ i))
-         (l lines (cdr l)))
-        ((or (null? l) ))
+       ((i 0 (1+ i))
+        (l lines (cdr l)))
+       ((or (null? l) ))
 
       (format out format-str
-              (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))
-
-                "-")
-               (else "0"))
-              (1+ i)
-              (car l)))))
+                      (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))
+
+                        "-")
+                       (else "0"))
+                      (1+ i)
+                      (car l)))))
 
 (define (record-coverage key cont exp env)
   (let*
@@ -78,20 +78,20 @@
        (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)
-                                     dst 0)
-                  dst)))
+                 (vector-move-left! src 0 (vector-length src)
+                                    dst 0)
+                 dst)))
     (if (and line name)
-        (begin
-          (if (or (not vec) (>= line (vector-length vec)))
-              (set! vec
-                    (hash-set! coverage-table name
-                               (if vec
-                                   (veccopy vec (make-vector (1+ line) #f))
-                                   (make-vector (1+ line) #f)))))
-
-          (vector-set! vec line #t))
-        )))
+       (begin
+         (if (or (not vec) (>= line (vector-length vec)))
+             (set! vec
+                   (hash-set! coverage-table name
+                               (if vec
+                                   (veccopy vec (make-vector (1+ line) #f))
+                                   (make-vector (1+ line) #f)))))
+
+         (vector-set! vec line #t))
+    )))