Merge pull request purescript#1603 from purescript/fieldpuns

paf31 · paf31 · commit 3c357d9349be · 2015-11-03T12:02:30.000-08:00
Field puns, fix purescript#921
diff --git a/examples/passing/FieldPuns.purs b/examples/passing/FieldPuns.purs
@@ -0,0 +1,8 @@
+module Main where
+
+import Prelude
+import Control.Monad.Eff.Console
+
+greet { greeting, name } = log $ greeting <> ", " <> name <> "."
+
+main = greet { greeting: "Hello", name: "World" } 
diff --git a/src/Language/PureScript/Parser/Declarations.hs b/src/Language/PureScript/Parser/Declarations.hs
@@ -517,11 +517,13 @@ parseNullBinder :: TokenParser Binder
 parseNullBinder = underscore *> return NullBinder
 
 parseIdentifierAndBinder :: TokenParser (String, Binder)
-parseIdentifierAndBinder = do
-  name <- lname <|> stringLiteral
-  C.indented *> (equals <|> colon)
-  binder <- C.indented *> parseBinder
-  return (name, binder)
+parseIdentifierAndBinder =
+  do name <- lname
+     b <- P.option (VarBinder (Ident name)) rest
+     return (name, b)
+  <|> (,) <$> stringLiteral <*> rest
+  where
+  rest = C.indented *> (equals <|> colon) *> C.indented *> parseBinder
 
 -- |
 -- Parse a binder
