Issue 2078: always-changing regtest: graphviz.log

This sanitizes some association list usage and protects hooks against
garbage collection.

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 153627274d03e274abe1cdf0dc8ce00808e51a84..22c5fe2e7198e644d9001d8144587043671dbcbc 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -36,8 +36,8 @@ print_property_callback_stack ()
 }
 #endif
 
-static SCM modification_callback = SCM_EOL;
-static SCM cache_callback = SCM_EOL;
+static Protected_scm modification_callback = SCM_EOL;
+static Protected_scm cache_callback = SCM_EOL;
 
 /*
 FIXME: this should use ly:set-option interface instead.

diff --git a/scm/graphviz.scm b/scm/graphviz.scm
index 55124d0463fb4a1e75c0ba6ae4564bec54d6911c..247d30c4a7fc1bba8ede9e56965ed57de2532f6c 100644 (file)
--- a/scm/graphviz.scm
+++ b/scm/graphviz.scm
@@ -37,18 +37,18 @@
 
 (define (add-cluster graph node-id cluster-name)
   (let* ((cs (clusters graph))
-        (cluster (assq cluster-name cs))
+        (cluster (assoc cluster-name cs))
         (already-in-cluster (if cluster
                                 (cdr cluster)
                                 '())))
-    (set-clusters! graph (assq-set! cs
+    (set-clusters! graph (assoc-set! cs
                                    cluster-name
                                    (cons node-id already-in-cluster)))))
 
 (define (add-node graph label . cluster-name)
   (let* ((ns (nodes graph))
          (id (length ns)))
-    (set-nodes! graph (assq-set! ns id label))
+    (set-nodes! graph (assv-set! ns id label))
     (if (and (not (null? cluster-name))
             (string? (car cluster-name)))
        (add-cluster graph id (car cluster-name)))