From d368210af5760d81fcb9964d3cd88c590c36407f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 20 Dec 2022 16:34:22 -0500 Subject: [PATCH] kconfig: Move pair->config-string up. * guix/build/kconfig.scm (pair->config-string): Move earlier, to match the natural dependency of declarations (useful when experimenting at the REPL). --- guix/build/kconfig.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/guix/build/kconfig.scm b/guix/build/kconfig.scm index d0189f558f..192bc17c21 100644 --- a/guix/build/kconfig.scm +++ b/guix/build/kconfig.scm @@ -31,6 +31,16 @@ ;; ;; Code: +(define (pair->config-string pair) + "Convert a PAIR back to a config-string." + (let* ((key (first pair)) + (value (cdr pair))) + (if (string? key) + (if (string? value) + (string-append key "=" value) + (string-append "# " key " is not set")) + value))) + (define (config-string->pair config-string) "Parse a configuration string like \"CONFIG_EXAMPLE=m\" into a key-value pair. An error is thrown for invalid configurations. @@ -77,16 +87,6 @@ An error is thrown for invalid configurations. (cons #f config-string) ;keep valid comments (error "Invalid configuration" config-string))))) -(define (pair->config-string pair) - "Convert a PAIR back to a config-string." - (let* ((key (first pair)) - (value (cdr pair))) - (if (string? key) - (if (string? value) - (string-append key "=" value) - (string-append "# " key " is not set")) - value))) - (define (defconfig->alist defconfig) "Convert the content of a DEFCONFIG (or .config) file into an alist." (with-input-from-file defconfig