Fix purescript#2149, remove support for = in ObjectBinder (purescript#2152)

paf31 · paf31 · commit e7ddf82d4ef3 · 2016-05-22T15:52:28.000-07:00
* Fix purescript#2149, remove support for = in ObjectBinder * Extended matches must specify a binder
diff --git a/examples/passing/LiberalTypeSynonyms.purs b/examples/passing/LiberalTypeSynonyms.purs
@@ -17,6 +17,6 @@ type F r = { | r } -> { | r }
 
 f :: (forall r. F r) -> String
 f g = case g { x: "Hello" } of
-        { x = x } -> x
+        { x: x } -> x
 
 main = log "Done"
diff --git a/examples/passing/NamedPatterns.purs b/examples/passing/NamedPatterns.purs
@@ -4,7 +4,7 @@ import Prelude
 import Control.Monad.Eff.Console (log)
 
 foo = \x -> case x of
-  y@{ foo = "Foo" } -> y
+  y@{ foo: "Foo" } -> y
   y -> y
 
 main = log "Done"
diff --git a/examples/passing/ObjectUpdate.purs b/examples/passing/ObjectUpdate.purs
@@ -9,8 +9,8 @@ update2 :: forall r. { foo :: String | r } -> { foo :: String | r }
 update2 = \o -> o { foo = "Foo" }
 
 replace = \o -> case o of
-  { foo = "Foo" } -> o { foo = "Bar" }
-  { foo = "Bar" } -> o { bar = "Baz" }
+  { foo: "Foo" } -> o { foo = "Bar" }
+  { foo: "Bar" } -> o { bar = "Baz" }
   o -> o
 
 polyUpdate :: forall a r. { foo :: a | r } -> { foo :: String | r }
diff --git a/examples/passing/Objects.purs b/examples/passing/Objects.purs
@@ -26,7 +26,7 @@ test4 = test2 weirdObj
   weirdObj = { "!@#": 1.0 }
 
 test5 = case { "***": 1.0 } of
-  { "***" = n } -> n
+  { "***": n } -> n
 
 test6 = case { "***": 1.0 } of
              { "***": n } -> n
diff --git a/examples/passing/Patterns.purs b/examples/passing/Patterns.purs
@@ -4,12 +4,12 @@ import Prelude
 import Control.Monad.Eff.Console (log)
 
 test = \x -> case x of
-  { str = "Foo", bool = true } -> true
-  { str = "Bar", bool = b } -> b
+  { str: "Foo", bool: true } -> true
+  { str: "Bar", bool: b } -> b
   _ -> false
 
 f = \o -> case o of
-  { foo = "Foo" } -> o.bar
+  { foo: "Foo" } -> o.bar
   _ -> 0
 
 h = \o -> case o of
diff --git a/examples/passing/Rank2Object.purs b/examples/passing/Rank2Object.purs
@@ -6,6 +6,6 @@ import Control.Monad.Eff.Console
 data Foo = Foo { id :: forall a. a -> a }
 
 foo :: Foo -> Number
-foo (Foo { id = f }) = f 0.0
+foo (Foo { id: f }) = f 0.0
 
 main = log "Done"
diff --git a/examples/passing/ReservedWords.purs b/examples/passing/ReservedWords.purs
@@ -12,7 +12,7 @@ p :: { type :: String }
 p = o { type = "p" }
 
 f :: forall r. { type :: String | r } -> String
-f { type = "p" } = "Done"
+f { type: "p" } = "Done"
 f _ = "Fail"
 
 main :: Eff _ _
diff --git a/src/Language/PureScript/Parser/Declarations.hs b/src/Language/PureScript/Parser/Declarations.hs
@@ -504,12 +504,12 @@ parseNullBinder = underscore *> return NullBinder
 
 parseIdentifierAndBinder :: TokenParser (String, Binder)
 parseIdentifierAndBinder =
-  do name <- lname
-     b <- P.option (VarBinder (Ident name)) rest
-     return (name, b)
-  <|> (,) <$> stringLiteral <*> rest
+    do name <- lname
+       b <- P.option (VarBinder (Ident name)) rest
+       return (name, b)
+    <|> (,) <$> stringLiteral <*> rest
   where
-  rest = C.indented *> (equals <|> colon) *> C.indented *> parseBinder
+    rest = C.indented *> colon *> C.indented *> parseBinder
 
 -- |
 -- Parse a binder
@@ -572,4 +572,3 @@ parseBinderNoParens = P.choice
 --
 parseGuard :: TokenParser Guard
 parseGuard = pipe *> C.indented *> parseValue
-
