diff options
author | Arun Isaac | 2021-02-27 19:47:47 +0530 |
---|---|---|
committer | Arun Isaac | 2021-02-27 19:47:47 +0530 |
commit | d475760dfbbc0a3bb2732a924b006e68f6dcc065 (patch) | |
tree | f7381f6ff25ef3b91806e66dacef3bc7425e6292 /ccwl/yaml.scm | |
parent | 52980a641e7434cb7610d7c857df6f1482bd07ec (diff) | |
download | ccwl-d475760dfbbc0a3bb2732a924b006e68f6dcc065.tar.gz ccwl-d475760dfbbc0a3bb2732a924b006e68f6dcc065.tar.lz ccwl-d475760dfbbc0a3bb2732a924b006e68f6dcc065.zip |
Display dictionary entries with empty values on the same line.
* ccwl/yaml.scm (display-dictionary-entry): If value is an empty array
or dictionary, display it on the same line.
(scm->yaml): Go to next line after printing empty array.
* tests/yaml.scm: New file.
* tests/yaml.scm ("dictionary entries with empty arrays and
dictionaries for values must render on the same line"): New test case.
Diffstat (limited to 'ccwl/yaml.scm')
-rw-r--r-- | ccwl/yaml.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ccwl/yaml.scm b/ccwl/yaml.scm index f24d27e..0c0bf1d 100644 --- a/ccwl/yaml.scm +++ b/ccwl/yaml.scm @@ -53,13 +53,16 @@ ATOM is a symbol." (display-atom key port) (display ":" port) (match value - ((or #(_ ...) - ((_ . _) (_ . _) ...)) + ;; If value is an empty array or dictionary, display it on the + ;; same line. + ((or #() ()) + (display " " port) + (scm->yaml value port level)) + ;; Else, display it on the next line. + (_ (newline port) (indent-level port (1+ level)) - (scm->yaml value port (1+ level))) - (_ (display " " port) - (scm->yaml value port level)))))) + (scm->yaml value port (1+ level))))))) (define* (scm->yaml scm #:optional (port (current-output-port)) (level 0)) "Convert SCM, an S-expression tree, to YAML and display to @@ -72,7 +75,8 @@ PORT. LEVEL is an internal recursion variable." (display-array-element element port level)) tail)) (#() - (display "[]" port)) + (display "[]" port) + (newline port)) ((head tail ...) (display-dictionary-entry head port level) (for-each (lambda (entry) |