[bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables.

[bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables.

[Lars-Dominik Braun]

* guix/build/toml.scm (eval-toml-file): Add pattern for empty inline table.
* tests/toml.scm ("parse-toml: Empty inline table"): New testcase.

Change-Id: I69663af2a861716acfb801fad4474e029e102a1b
---
 guix/build/toml.scm | 1 +
 tests/toml.scm      | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/guix/build/toml.scm b/guix/build/toml.scm
index 81b54fa5b7..a9be0887e7 100644
--- a/guix/build/toml.scm
+++ b/guix/build/toml.scm
@@ -414,6 +414,7 @@ (define (eval-toml-file parse-tree)
                                           local-time)
                                         tails)))
       ('array (list))
+      ('inline-table '())
       (('inline-table tails ...)
        (eval (keyword-flatten '(keyval) tails) '() '()))))
 
diff --git a/tests/toml.scm b/tests/toml.scm
index cd8e4d2338..64bc667f0c 100644
--- a/tests/toml.scm
+++ b/tests/toml.scm
@@ -396,6 +396,14 @@ (define-module (test-toml)
 point = { x = 1, y = 2 }
 animal = { type.name = \"pug\" }"))
 
+(test-equal "parse-toml: Empty inline table"
+ '(("name")
+   ("point")
+   ("animal"))
+ (parse-toml "name = {}
+point = { }
+animal = {    }"))
+
 (test-error "parse-toml: Invalid assignment to inline table"
  #t
  (parse-toml "[product]

base-commit: 946e48d1d87ec451e7a6315712f2e86c79961a51
-- 
2.45.2

[bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables.

[Ludovic Courtès]

Lars-Dominik Braun <lars@6xq.net> skribis:

> * guix/build/toml.scm (eval-toml-file): Add pattern for empty inline table.
> * tests/toml.scm ("parse-toml: Empty inline table"): New testcase.
>
> Change-Id: I69663af2a861716acfb801fad4474e029e102a1b

LGTM!

[bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables.

[Lars-Dominik Braun]

Hi,

> LGTM!

thanks. Since pyproject-build-system depends on (guix build toml) this
is a world-rebuilding change. Can we piggyback this patch onto another
(possibly unrelated) world-rebuilding branch?

Lars

[bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables.

[Ludovic Courtès]

Hi,

Lars-Dominik Braun <lars@6xq.net> skribis:

>> LGTM!
>
> thanks. Since pyproject-build-system depends on (guix build toml) this
> is a world-rebuilding change. Can we piggyback this patch onto another
> (possibly unrelated) world-rebuilding branch?

Oh, good point.  I guess this can go to the ‘python-team’ branch?

Ludo’.