ea2a61e · elk · git.iko.soy

git.iko.soy/elk

Fix bug in parsing type applications

Accidentally reversed arguments twice!

commitea2a61e1e22a1cb1903f727ead56fa4d8c4fbb0b authorEvan Czaplicki <evancz@users.noreply.github.com> dateSun 4 Dec 2016, 21:49 (10 years ago) parente53128c

3 files changed+19−1

compare with master

unifiedsplit

src/AST/Variable.hs+10 src/Parse/Type.hs+1−1 src/Validate.hs+8

src/AST/Variable.hs+10

@@ -58,6 +58,16 @@ fromModule home name =

5858 Canonical (Module home) name

5959

6060

61+localize :: Canonical -> Canonical

62+localize var@(Canonical home name) =

63+ case home of

64+ TopLevel _ ->

65+ Canonical Local name

66+

67+ _ ->

68+ var

69+

70+

6171inCore :: ModuleName.Raw -> Text -> Canonical

6272inCore home name =

6373 Canonical (Module (ModuleName.inCore home)) name

src/Parse/Type.hs+1−1

@@ -81,7 +81,7 @@ app start =

8181 _ ->

8282 let

8383 tipe =

84− A.at start end (Type.RApp ctor (reverse args))

84+ A.at start end (Type.RApp ctor args)

8585 in

8686 return ( tipe, end, space )

8787

src/Validate.hs+8

@@ -12,10 +12,12 @@ import Data.Text (Text)

1212import qualified AST.Effects as Effects

1313import qualified AST.Expression.Source as Src

1414import qualified AST.Declaration as D

15+import qualified AST.Literal as L

1516import qualified AST.Module as Module

1617import qualified AST.Module.Name as ModuleName

1718import qualified AST.Pattern as Pattern

1819import qualified AST.Type as Type

20+import qualified AST.Variable as Var

1921import qualified Elm.Compiler.Imports as Imports

2022import qualified Elm.Package as Package

2123import Elm.Utils ((|>))

@@ -464,6 +466,12 @@ expression :: Src.RawExpr -> Result wrn Src.ValidExpr

464466expression (A.A ann sourceExpression) =

465467 A.A ann <$>

466468 case sourceExpression of

469+ Src.Var (Var.Raw "True") ->

470+ return (Src.Literal (L.Boolean True))

471+

472+ Src.Var (Var.Raw "False") ->

473+ return (Src.Literal (L.Boolean False))

474+

467475 Src.Var x ->

468476 return (Src.Var x)

469477