bca019d · elk · git.iko.soy

git.iko.soy/elk

Disallow (+) in let expressions in the parser

commitbca019ddbd4e33aa82495a5546e3ceedfa5e395f authorEvan Czaplicki <evancz@users.noreply.github.com> dateMon 4 Sep 2017, 15:24 (9 years ago) parent59295e1

3 files changed+25−20

compare with master

unifiedsplit

src/Parse/Declaration.hs+1−1 src/Parse/Expression.hs+23−17 src/Parse/Repl.hs+1−2

src/Parse/Declaration.hs+1−1

@@ -48,7 +48,7 @@ docDecl start =

4848

4949defDecl :: R.Position -> SParser Decl.Source

5050defDecl start =

51− do (def, end, pos) <- Expr.definition

51+ do (def, end, pos) <- Expr.topLevelDef

5252 let decl = A.at start end (Decl.Def def)

5353 return ( Decl.Whatever decl, end, pos )

5454

src/Parse/Expression.hs+23−17

@@ -1,6 +1,6 @@

11{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-}

22{-# LANGUAGE OverloadedStrings #-}

3−module Parse.Expression (term, expression, definition, rootPattern) where

3+module Parse.Expression (term, expression, topLevelDef) where

55import Control.Monad (guard)

66import qualified Data.List as List

@@ -474,7 +474,7 @@ let_ start =

474474 spaces

475475 defIndent <- getCol

476476 setIndent defIndent

477− (def, end, space) <- definition

477+ (def, end, space) <- letDef

478478 letHelp start oldIndent [def] end space

479479

480480

@@ -482,7 +482,7 @@ letHelp :: R.Position -> Int -> [Src.RawDef] -> R.Position -> SPos -> ExprParser

482482letHelp start oldIndent revDefs end pos =

483483 oneOf

484484 [ do checkAligned pos

485− (def, newEnd, newPos) <- definition

485+ (def, newEnd, newPos) <- letDef

486486 letHelp start oldIndent (def:revDefs) newEnd newPos

487487

488488 , do setIndent oldIndent

@@ -500,10 +500,27 @@ letHelp start oldIndent revDefs end pos =

500500-- DEFINITIONS

501501

502502

503−definition :: SParser Src.RawDef

504−definition =

503+letDef :: SParser Src.RawDef

504+letDef =

505+ definition $ \_ -> Pattern.term

506+

507+

508+topLevelDef :: SParser Src.RawDef

509+topLevelDef =

510+ definition $ \start ->

511+ oneOf

512+ [ do op <- try (leftParen >> infixOp)

513+ rightParen

514+ end <- getPosition

515+ return (A.at start end (P.Var op))

516+ , Pattern.term

517+ ]

518+

519+

520+definition :: (R.Position -> Parser P.Raw) -> SParser Src.RawDef

521+definition parseRoot =

505522 do start <- getPosition

506− root <- rootPattern start

523+ root <- parseRoot start

507524 spaces

508525 case A.drop root of

509526 P.Var name ->

@@ -521,17 +538,6 @@ definition =

521538 definitionHelp start root []

522539

523540

524−rootPattern :: R.Position -> Parser P.Raw

525−rootPattern start =

526− oneOf

527− [ do op <- try (leftParen >> infixOp)

528− rightParen

529− end <- getPosition

530− return (A.at start end (P.Var op))

531− , Pattern.term

532− ]

533−

534−

535541definitionHelp :: R.Position -> P.Raw -> [P.Raw] -> SParser Src.RawDef

536542definitionHelp start root revArgs =

537543 oneOf

src/Parse/Repl.hs+1−2

@@ -11,7 +11,6 @@ import qualified Data.Text as Text

1111import Data.Text (Text)

1212

1313import Parse.Helpers

14−import qualified Parse.Expression as Expr

1514import qualified Parse.Pattern as Pattern

1615

1716import qualified AST.Pattern as P

@@ -74,7 +73,7 @@ entryParser source =

7473 name <- capVar

7574 return (Type (Text.unpack name) source)

7675

77− , do root <- Expr.rootPattern =<< getPosition

76+ , do root <- Pattern.term

7877 spaces

7978 case A.drop root of

8079 P.Var name ->