git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #2068 from purescript/2049

Make as-patterns bind less tightly

commit13fb81ea59ed31d29034e8142cba17b819f3066f authorPhil Freeman <paf31@cantab.net> dateSat 30 Apr 2016, 15:41 (11 years ago) parent7e92e7c1c1d6af
2 files changed+29−14
compare with golang
unifiedsplit
examples/passing/2049.purs+13 src/Language/PureScript/Parser/Declarations.hs+16−14
examples/passing/2049.pursnew file+13
@@ -0,0 +1,13 @@
1+module Main where
2+
3+import Prelude
4+import Control.Monad.Eff.Console (log)
5+
6+data List a = Cons a (List a) | Nil
7+
8+infixr 6 Cons as :
9+
10+f :: List { x :: Int, y :: Int } -> Int
11+f ( r@{ x } : _) = x + r.y
12+
13+main = log "Done"
src/Language/PureScript/Parser/Declarations.hs+16−14
@@ -483,7 +483,7 @@ parseVarOrNamedBinder = do
483483 -- TODO: once operator aliases are finalized in 0.9, this 'try' won't be needed
484484 -- any more since identifiers in binders won't be 'Op's.
485485 name <- P.try C.parseIdent
486− let parseNamedBinder = NamedBinder name <$> (at *> C.indented *> parseBinder)
486+ let parseNamedBinder = NamedBinder name <$> (at *> C.indented *> parseBinderAtom)
487487 parseNamedBinder <|> return (VarBinder name)
488488
489489parseNullBinder :: TokenParser Binder
@@ -515,26 +515,28 @@ parseBinder =
515515 return (BinaryNoParensBinder op)) P.AssocRight
516516 ]
517517 ]
518+
518519 -- TODO: parsePolyType when adding support for polymorphic types
519520 postfixTable = [ \b -> flip TypedBinder b <$> (indented *> doubleColon *> parseType)
520521 ]
521− parseBinderAtom :: TokenParser Binder
522− parseBinderAtom = P.choice
523− [ parseNullBinder
524− , LiteralBinder <$> parseCharLiteral
525− , LiteralBinder <$> parseStringLiteral
526− , LiteralBinder <$> parseBooleanLiteral
527− , parseNumberLiteral
528− , parseVarOrNamedBinder
529− , parseConstructorBinder
530− , parseObjectBinder
531− , parseArrayBinder
532− , ParensInBinder <$> parens parseBinder
533− ] P.<?> "binder"
534522
535523 parseOpBinder :: TokenParser Binder
536524 parseOpBinder = OpBinder <$> parseQualified (Op <$> symbol)
537525
526+parseBinderAtom :: TokenParser Binder
527+parseBinderAtom = P.choice
528+ [ parseNullBinder
529+ , LiteralBinder <$> parseCharLiteral
530+ , LiteralBinder <$> parseStringLiteral
531+ , LiteralBinder <$> parseBooleanLiteral
532+ , parseNumberLiteral
533+ , parseVarOrNamedBinder
534+ , parseConstructorBinder
535+ , parseObjectBinder
536+ , parseArrayBinder
537+ , ParensInBinder <$> parens parseBinder
538+ ] P.<?> "binder"
539+
538540-- |
539541-- Parse a binder as it would appear in a top level declaration
540542--