Parse trailling comma & multiline

nirum-lang · Apr 19, 2018 · 6b824da · 6b824da
1 parent c68058f
commit 6b824da
Showing 1 changed file with 5 additions and 4 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 ';'