212b602 · elk · git.iko.soy

git.iko.soy/elk

Update parser for Reporting.Annotation simplification

commit212b60267f5ca34e8f4c9fda1ef83b28364eb4ac authorEvan Czaplicki <evancz@users.noreply.github.com> dateFri 17 Nov 2017, 13:57 (9 years ago) parent86148e8

4 files changed+5−5

compare with master

unifiedsplit

src/Parse/Kernel.hs+2−2 src/Parse/Parse.hs+1−1 src/Parse/Pattern.hs+1−1 src/Parse/Primitives.hs+1−1

src/Parse/Kernel.hs+2−2

@@ -140,7 +140,7 @@ type Imports =

140140

141141

142142destructImport :: Src.Import -> Imports

143−destructImport (Src.Import (A.A _ moduleName) maybeAlias exposing) =

143+destructImport (Src.Import (A.At _ moduleName) maybeAlias exposing) =

144144 let

145145 shortName =

146146 case maybeAlias of

@@ -168,7 +168,7 @@ destructImport (Src.Import (A.A _ moduleName) maybeAlias exposing) =

168168

169169

170170exposedToName :: A.Located Src.Exposed -> N.Name

171−exposedToName (A.A _ exposed) =

171+exposedToName (A.At _ exposed) =

172172 case exposed of

173173 Src.Lower name ->

174174 name

src/Parse/Parse.hs+1−1

@@ -27,7 +27,7 @@ program src =

2727 Right modul ->

2828 Validate.validate modul

2929

30− Left (A.A region syntaxError) ->

30+ Left (A.At region syntaxError) ->

3131 Result.throw region syntaxError

3232

3333

src/Parse/Pattern.hs+1−1

@@ -221,7 +221,7 @@ exprHelp start patterns (pattern, _end, sPos) =

221221

222222

223223cons :: Src.Pattern -> Src.Pattern -> Src.Pattern

224−cons tl@(A.A (R.Region _ end) _) hd@(A.A (R.Region start _) _) =

224+cons tl@(A.At (R.Region _ end) _) hd@(A.At (R.Region start _) _) =

225225 A.at start end (Src.PCons hd tl)

226226

227227

src/Parse/Primitives.hs+1−1

@@ -46,7 +46,7 @@ runAt startRow startColumn (Parser parser) (B.PS fp offset length) =

4646 let

4747 pos = R.Position row col

4848 mkError overallRegion subRegion =

49− Left (A.A overallRegion (E.Parse subRegion problem))

49+ Left (A.At overallRegion (E.Parse subRegion problem))

5050 in

5151 case problem of

5252 E.BadChar endCol ->