Simplified tree-to-dot

funcs.el

@@ -15,53 +15,44 @@
 (defun conlanging//declare-node (node-text node-generation)
   "Declares a node in the graphviz source code. The node’s identifier will be
 ~node-generation~, and it will bear the label ~node-text~."
-  (concat (number-to-string node-generation)
+  (format "%d[label=\"%s\"];\n" node-generation
-          "[label=\""
+          node-text))
-          node-text
-          "\"];"))
 
-(defun conlanging//make-link (previous-node current-node)
+(defun conlanging/tree-to-dot (tree &optional current-generation previous-generation)
-  "This creates a link in the graphviz source code between the two nodes
+  "Translates an Elisp tree with any number of children per node
-bearing ~previous-node~ and ~current-node~ respectively as their node
+to a corresponding graphviz file that can be executed from dot.
-identifier."
-  (concat (number-to-string previous-node) " -- "
-          (number-to-string current-node) ";"))
-
-(defun conlanging//tree-to-dot-helper (tree current-generation previous-generation)
-  "Helper to ~tree-to-dot~ that translates an Elisp tree with any number of
-children per node to a corresponding graphviz file that can be executed from
-dot.
 Arguments:
-- tree :: tree-to-convert
+- `tree': tree to convert
-- current-generation :: Generation number, incremented when changing from a node
+- `current-generation': generation number, incremented when
-     to another node from the same generation, multiplied by 10 when going from
+  changing from a node to another node from the same generation,
-     a node to one of its children.
+  multiplied by 10 when going from a node to one of its children.
-- previous-generation :: generation number from previous named node"
+- `previous-generation': generation number from previous named
+  node"
   (cond
-   ((null tree) "")
+   ((null previous-generation) ;; first call
-   ((atom (car tree)) ;; '("text" () () ())
+    (concat "graph{graph[dpi=300];node[shape=plaintext];graph[bgcolor=\"transparent\"];\n"
-    (concat (conlanging//declare-node (car tree) current-generation)
+            (conlanging//declare-node (car tree) 0)
-            (conlanging//make-link previous-generation current-generation)
+            (conlanging/tree-to-dot (cdr tree) 1 0)
-            (conlanging//tree-to-dot-helper (cdr tree)
+            "}"))
-                                            (+ 1 (* 10 current-generation))
+   ((null tree) "") ;; last call in this branch
+   ((atom (car tree)) ;; '("text" () () ()) manage the label
+    (concat (conlanging//declare-node (car tree)
+                                      current-generation)
+            ;; make link
+            (concat (number-to-string previous-generation) " -- "
+                    (number-to-string current-generation) ";\n")
+            (conlanging/tree-to-dot (cdr tree)
+                                    (+ 1
+                                       (* 10 current-generation))
                                     current-generation)))
-   ((listp (car tree)) ;; '(() () ())
+   ((listp (car tree)) ;; '(() () ()) manage the branches
-    (concat (conlanging//tree-to-dot-helper (car tree) ;; child of current node
+    (concat (conlanging/tree-to-dot (car tree) ;; child of current node
                                     current-generation
                                     previous-generation)
-            (conlanging//tree-to-dot-helper (cdr tree)
+            (conlanging/tree-to-dot (cdr tree)
                                     (+ 1 current-generation)
                                     previous-generation)))))
 
-(defun conlanging/tree-to-dot (tree)
-  "Returns a graphviz’s dot compatible string representing an Elisp tree"
-  (if (null tree) ""
-    (concat
-     "graph{graph[dpi=300];node[shape=plaintext];graph[bgcolor=\"transparent\"];"
-     (conlanging//declare-node (car tree) 0)
-     (conlanging//tree-to-dot-helper (cdr tree) 1 0)
-     "}")))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                                         ;                Common               ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;