Parse trailling comma & multiline

nirum-lang · Apr 12, 2018 · afd38bf · afd38bf
1 parent 6684371
commit afd38bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Nirum/Parser.hs b/src/Nirum/Parser.hs
@@ -652,15 +652,16 @@ imports forwardNames = do
     spaces
     char '('
     spaces
-    idents <- many' [] $ \ importNames' -> do
+    idents <- many' [] $ \ importNames' -> try $ do
         let forwardNames' = [ i | (_, i, _) <- importNames' ] ++
                 forwardNames
         unless (L.null importNames') $ do
             string' ","
             spaces
-        i <- importName forwardNames'
-        spaces
-        return i
+        importName forwardNames'
+    when (L.null idents) $ fail "parentheses cannot be empty"
+    void $ optional $ string' ","
+    spaces
     char ')'
     spaces
     char ';'

diff --git a/test/Nirum/ParserSpec.hs b/test/Nirum/ParserSpec.hs
@@ -1164,7 +1164,7 @@ service method-dups (
                     , Import ["foo", "bar"] "b" "b" empty
                     ]
         specify "import names can have a trailing comma" $
-            parse' "import foo.bar (a, b,);" `shouldBeRight`
+            parse' "import foo.bar (a, b,)  ;" `shouldBeRight`
                 [ Import ["foo", "bar"] "a" "a" empty
                 , Import ["foo", "bar"] "b" "b" empty
                 ]