feature: Liberalize record/array literals parsing

supki · Oct 8, 2024 · 8990799 · 8990799
1 parent 0992246
commit 8990799
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/src/T/Parse.hs b/src/T/Parse.hs
@@ -296,10 +296,10 @@ litP = do
     map String stringLiteral
   arrayP =
     map (Array . Vector.fromList)
-      (brackets (Unspaced (sepBy expP (symbol ","))))
+      (brackets (spaces *> Unspaced (sepBy expP (symbol ","))))
   recordP =
     map (Record . HashMap.fromList)
-      (braces (Unspaced (sepBy kv (symbol ","))))
+      (braces (spaces *> Unspaced (sepBy kv (symbol ","))))
    where
     kv = do
       k <- map fromString (some letter)

diff --git a/test/T/ParseSpec.hs b/test/T/ParseSpec.hs
@@ -161,6 +161,36 @@ spec =
         \     foo =\n\
         \       4\n\
         \%}" `shouldParseTo` Tmpl.Set [Tmpl.Assign (var "foo") (int 4)]
+        "{% set\n\
+        \     arr =\n\
+        \       [ 4\n\
+        \       , 7\n\
+        \       , 42\n\
+        \       ]\n\
+        \%}" `shouldParseTo` Tmpl.Set
+          [ Tmpl.Assign
+              (var "arr")
+              (array
+                [ int 4
+                , int 7
+                , int 42
+                ])
+          ]
+        "{% set\n\
+        \     rec =\n\
+        \       { foo: 4\n\
+        \       , bar: 7\n\
+        \       , baz: 42\n\
+        \       }\n\
+        \%}" `shouldParseTo` Tmpl.Set
+          [ Tmpl.Assign
+              (var "rec")
+              (record
+                [ ("foo", int 4)
+                , ("bar", int 7)
+                , ("baz", int 42)
+                ])
+          ]
 
     context "multi-*" $ do
       it "multi-sets" $ do