From 0972feaff1f766c1759d0b89876132ae473725ce Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 30 Apr 2022 15:39:34 +0200
Subject: import: cabal: Allow curly brackets in more positions.

* guix/import/cabal.scm (is-layout-property): Do not expect end of line.
(lex-layout-property): Check for newline.
(lex-property): Stop reading on closing curly bracket.
* tests/hackage.scm (test-read-cabal-2): New variable.
("read-cabal test: if brackets on the same line"): New test.
---
 tests/hackage.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'tests/hackage.scm')

diff --git a/tests/hackage.scm b/tests/hackage.scm
index 38f75b268e..15309a3381 100644
--- a/tests/hackage.scm
+++ b/tests/hackage.scm
@@ -156,6 +156,12 @@ (define test-read-cabal-1
   Exposed-Modules:
     Test.QuickCheck.Exception")
 
+(define test-read-cabal-2
+  "name: test-me
+common defaults
+    if os(foobar) { cc-options: -DBARBAZ }
+") ; Intentional newline.
+
 (test-begin "hackage")
 
 (define-syntax-rule (define-package-matcher name pattern)
@@ -471,6 +477,16 @@ (define-package-matcher match-ghc-foo-revision
      #t)
     (x (pk 'fail x #f))))
 
+(test-assert "read-cabal test: if brackets on the same line"
+  (match (call-with-input-string test-read-cabal-2 read-cabal)
+    ((("name" ("test-me"))
+        ('section 'common "defaults"
+          (('if ('os "foobar")
+               (("cc-options" ("-DBARBAZ ")))
+               ()))))
+     #t)
+    (x (pk 'fail x #f))))
+
 (define test-cabal-import
   "name: foo
 version: 1.0.0
-- 
cgit v1.2.3

m?id=3cfa236e5692a73e589064d4bd2776610e9bce31'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/tryton.scm'>
<input type='hidden' name='id' value='3cfa236e5692a73e589064d4bd2776610e9bce31'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=3cfa236e5692a73e589064d4bd2776610e9bce31'>root</a>/<a href='/guix/log/gnu?id=3cfa236e5692a73e589064d4bd2776610e9bce31'>gnu</a>/<a href='/guix/log/gnu/packages?id=3cfa236e5692a73e589064d4bd2776610e9bce31'>packages</a>/<a href='/guix/log/gnu/packages/tryton.scm?id=3cfa236e5692a73e589064d4bd2776610e9bce31'>tryton.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/tryton.scm?id=3cfa236e5692a73e589064d4bd2776610e9bce31&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-01-15 14:46:44 +0100'>2019-01-15</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=44d10b1f722856ab8e9b942804aa7ef33e2ef739'>gnu: Separate Python core packages from the rest.</a></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2018-01-22 22:09:27 +0100'>2018-01-22</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=fa5255fd6a8c50fd03347e85a8dededf179d1101'>gnu: python-trytond: End phase in #t.</a></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2018-01-22 19:52:39 +0100'>2018-01-22</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=9f832233f1adb9ce83d63219369ff1ad988f774b'>gnu: python-proteus: Add dependencies.</a></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2018-01-22 19:52:36 +0100'>2018-01-22</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=c8b1defe18a622d862a98ca7bbf3b908cd53d0be'>gnu: Add python-trytond-party.</a></td><td>Adriano Peluso</td></tr>
<tr><td><span title='2018-01-22 19:52:30 +0100'>2018-01-22</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=0a92ebdeeb8d147badea2bc96352767290c2d30e'>gnu: Add python-trytond-country.</a></td><td>Adriano Peluso</td></tr>
<tr><td><span title='2018-01-22 19:52:25 +0100'>2018-01-22</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=f38d2b422aafb526f8baba91c51f5bd60cab5be8'>gnu: Rename "trytond" to "python-trytond".</a></td><td>Adriano Peluso</td></tr>
<tr><td><span title='2018-01-22 19:52:22 +0100'>2018-01-22</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=bf3563d5a4cbd8ff83b564442105d1f0d5e100e2'>gnu: Add python-proteus.</a></td><td>Adriano Peluso</td></tr>
<tr><td><span title='2018-01-22 19:52:16 +0100'>2018-01-22</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=974a4d5d57bac2a2516ed0960025cc6610d03bc6'>gnu: tryton: Updated to 4.6.2.</a></td><td>Adriano Peluso</td></tr>
<tr><td><span title='2018-01-22 19:52:13 +0100'>2018-01-22</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=7e99221db9c984751556f4062bf084fdf288207e'>gnu: trytond: Updated to 4.6.2.</a></td><td>Adriano Peluso</td></tr>
<tr><td><span title='2017-11-18 12:45:19 +0100'>2017-11-18</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=33dc54b08c5b56fbe87229fe05f5c7de8c6f1179'>gnu: Move date/time packages from python.scm to time.scm.</a></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2017-11-17 22:36:27 +0100'>2017-11-17</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=a8714bf6801cf5058fd02bcb1d352a99d12bc870'>gnu: Move database packages from python.scm to databases.scm.</a></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2017-11-17 22:36:26 +0100'>2017-11-17</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=ac257f127ac5e1fd4758d3a05e4a19fde3af4e01'>gnu: Move testing packages from python.scm to check.scm.</a></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2017-11-13 23:41:01 +0100'>2017-11-13</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=1b2f753d9c73a5431ec1f5510449c480debf80ce'>gnu: Move web packages from python to python-web.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-27 18:41:13 +0530'>2017-05-27</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=16855482fd0bcc2460028c701498d35d248a6269'>gnu: Add tryton.</a></td><td>Adriano Peluso</td></tr>
<tr><td><span title='2017-05-27 18:41:12 +0530'>2017-05-27</span></td><td><a href='/guix/commit/gnu/packages/tryton.scm?id=48174fb9aacd2a9c52edf769094481bc9ba03003'>gnu: Add trytond.</a></td><td>Adriano Peluso</td></tr>