git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1619 from purescript/1090
f1c330fPhil Freeman
examples/passing/OperatorSections.purs+6
compare with golang
unifiedsplit
@@ -8,4 +8,10 @@ main = do
8 assert $ (2.0 /) 4.0 == 0.5
8 assert $ (2.0 /) 4.0 == 0.5
9 assert $ (`const` 1.0) 2.0 == 2.0
9 assert $ (`const` 1.0) 2.0 == 2.0
10 assert $ (1.0 `const`) 2.0 == 1.0
10 assert $ (1.0 `const`) 2.0 == 1.0
11+ let foo = { x: 2.0 }
12+ assert $ (/ foo.x) 4.0 == 2.0
13+ assert $ (foo.x /) 4.0 == 0.5
14+ let (//) x y = x.x / y.x
15+ assert $ (// foo { x = 4.0 }) { x: 4.0 } == 1.0
16+ assert $ (foo { x = 4.0 } //) { x: 4.0 } == 1.0
11 Control.Monad.Eff.Console.log "Done!"
17 Control.Monad.Eff.Console.log "Done!"
src/Language/PureScript/Parser/Declarations.hs+13−9
@@ -414,8 +414,8 @@ parseInfixExpr = P.between tick tick parseValue
414parseOperatorSection :: TokenParser Expr
414parseOperatorSection :: TokenParser Expr
415parseOperatorSection = parens $ left <|> right
415parseOperatorSection = parens $ left <|> right
416 where
416 where
417− right = OperatorSection <$> parseInfixExpr <* indented <*> (Right <$> parseValueAtom)
417+ right = OperatorSection <$> parseInfixExpr <* indented <*> (Right <$> indexersAndAccessors)
418− left = flip OperatorSection <$> (Left <$> parseValueAtom) <* indented <*> parseInfixExpr
418+ left = flip OperatorSection <$> (Left <$> indexersAndAccessors) <* indented <*> parseInfixExpr
419
419
420parsePropertyUpdate :: TokenParser (String, Maybe Expr)
420parsePropertyUpdate :: TokenParser (String, Maybe Expr)
421parsePropertyUpdate = do
421parsePropertyUpdate = do
@@ -449,21 +449,25 @@ parseDoNotationElement = P.choice
449parseObjectGetter :: TokenParser Expr
449parseObjectGetter :: TokenParser Expr
450parseObjectGetter = ObjectGetter <$> (underscore *> C.indented *> dot *> C.indented *> (lname <|> stringLiteral))
450parseObjectGetter = ObjectGetter <$> (underscore *> C.indented *> dot *> C.indented *> (lname <|> stringLiteral))
451
451
452+-- | Expressions including indexers and record updates
453+indexersAndAccessors :: TokenParser Expr
454+indexersAndAccessors = C.buildPostfixParser postfixTable parseValueAtom
455+ where
456+ postfixTable = [ parseAccessor
457+ , P.try . parseUpdaterBody . Just ]
458+
452-- |
459-- |
453-- Parse a value
460-- Parse a value
454--
461--
455parseValue :: TokenParser Expr
462parseValue :: TokenParser Expr
456parseValue = withSourceSpan PositionedValue
463parseValue = withSourceSpan PositionedValue
457 (P.buildExpressionParser operators
464 (P.buildExpressionParser operators
458− . C.buildPostfixParser postfixTable2
465+ . C.buildPostfixParser postfixTable
459 $ indexersAndAccessors) P.<?> "expression"
466 $ indexersAndAccessors) P.<?> "expression"
460 where
467 where
461− indexersAndAccessors = C.buildPostfixParser postfixTable1 parseValueAtom
462− postfixTable1 = [ parseAccessor
463− , P.try . parseUpdaterBody . Just ]
464− postfixTable2 = [ \v -> P.try (flip App <$> (C.indented *> indexersAndAccessors)) <*> pure v
468+ postfixTable = [ \v -> P.try (flip App <$> (C.indented *> indexersAndAccessors)) <*> pure v
465− , \v -> flip (TypedValue True) <$> (P.try (C.indented *> doubleColon) *> parsePolyType) <*> pure v
469+ , \v -> flip (TypedValue True) <$> (P.try (C.indented *> doubleColon) *> parsePolyType) <*> pure v
466− ]
470+ ]
467 operators = [ [ P.Prefix (P.try (C.indented *> symbol' "-") >> return UnaryMinus)
471 operators = [ [ P.Prefix (P.try (C.indented *> symbol' "-") >> return UnaryMinus)
468 ]
472 ]
469 , [ P.Infix (P.try (C.indented *> parseInfixExpr P.<?> "infix expression") >>= \ident ->
473 , [ P.Infix (P.try (C.indented *> parseInfixExpr P.<?> "infix expression") >>= \ident ->