nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

graph: Backend must have name and description. 

* guix/graph.scm (<graph-backend>): Add fields "name" and "description".
(%graphviz-backend): Provide values for name and description.
(export-graph): Ignore name and description when matching backends.
(graph-backend-name, graph-backend-description): New procedures.
* tests/graph.scm (make-recording-backend): Initialize name and
description fields of test graph-backend.
This commit is contained in:
Ricardo Wurmus 2016-10-20 08:47:03 +02:00
parent 089f385a21
commit 51377437a1
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/graph.scm
View File

@ -44,6 +44,8 @@
%graphviz-backend %graphviz-backend
graph-backend? graph-backend?
graph-backend graph-backend
graph-backend-name
graph-backend-description
export-graph)) export-graph))
@ -140,12 +142,14 @@ typically returned by 'node-edges' or 'node-back-edges'."
;;; ;;;
(define-record-type <graph-backend> (define-record-type <graph-backend>
(graph-backend prologue epilogue node edge) (graph-backend name description prologue epilogue node edge)
graph-backend? graph-backend?
(prologue graph-backend-prologue) (name graph-backend-name)
(epilogue graph-backend-epilogue) (description graph-backend-description)
(node graph-backend-node) (prologue graph-backend-prologue)
(edge graph-backend-edge)) (epilogue graph-backend-epilogue)
(node graph-backend-node)
(edge graph-backend-edge))
(define %colors (define %colors
;; See colortbl.h in Graphviz. ;; See colortbl.h in Graphviz.
@ -170,7 +174,9 @@ typically returned by 'node-edges' or 'node-back-edges'."
id1 id2 (pop-color id1))) id1 id2 (pop-color id1)))
(define %graphviz-backend (define %graphviz-backend
(graph-backend emit-prologue emit-epilogue (graph-backend "graphviz"
"Generate graph in DOT format for use with Graphviz."
emit-prologue emit-epilogue
emit-node emit-edge)) emit-node emit-edge))
(define* (export-graph sinks port (define* (export-graph sinks port
@ -181,7 +187,7 @@ typically returned by 'node-edges' or 'node-back-edges'."
given BACKEND. Use NODE-TYPE to traverse the DAG. When REVERSE-EDGES? is given BACKEND. Use NODE-TYPE to traverse the DAG. When REVERSE-EDGES? is
true, draw reverse arrows." true, draw reverse arrows."
(match backend (match backend
(($ <graph-backend> emit-prologue emit-epilogue emit-node emit-edge) (($ <graph-backend> _ _ emit-prologue emit-epilogue emit-node emit-edge)
(emit-prologue (node-type-name node-type) port) (emit-prologue (node-type-name node-type) port)
(match node-type (match node-type

3
tests/graph.scm
View File

@ -57,7 +57,8 @@ edges."
(define (return) (define (return)
(values (reverse nodes) (reverse edges))) (values (reverse nodes) (reverse edges)))
(values (graph-backend (const #t) (const #t) (values (graph-backend "test" "This is the test backend."
(const #t) (const #t)
record-node record-edge) record-node record-edge)
return))) return)))