git.iko.soy/elk
on master help sign in
Provide error type as args to Number.precedence and Space.docComment
commit8e0842cedcb8ef91bc65aab26339e6034d1a1e9b authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 25 Apr 2019, 19:52 (8 years ago) parent7a297d2
2 files changed+9−9
compare with master
unifiedsplit
compiler/src/Parse/Number.hs+4−4 compiler/src/Parse/Space.hs+5−5
compiler/src/Parse/Number.hs+4−4
@@ -285,11 +285,11 @@ stepHex pos end word acc
285285-- PRECEDENCE
286286
287287
288−precedence :: Parser E.Infix Binop.Precedence
289−precedence =
288+precedence :: (Row -> Col -> x) -> Parser x Binop.Precedence
289+precedence toExpectation =
290290 P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->
291291 if pos >= end then
292− eerr row col E.Precedence
292+ eerr row col toExpectation
293293
294294 else
295295 let !word = P.unsafeIndex pos in
@@ -299,4 +299,4 @@ precedence =
299299 (P.State (plusPtr pos 1) end indent row (col + 1))
300300
301301 else
302− eerr row col E.Precedence
302+ eerr row col toExpectation
compiler/src/Parse/Space.hs+5−5
@@ -240,8 +240,8 @@ eatMultiCommentHelp pos end row col openComments =
240240-- DOCUMENTATION COMMENT
241241
242242
243−docComment :: P.Parser E.Decl ()
244−docComment =
243+docComment :: (Row -> Col -> x) -> (Row -> Col -> x) -> (Row -> Col -> x) -> P.Parser x ()
244+docComment toExpectation toTabError toEndlessError =
245245 P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->
246246 let
247247 !pos3 = plusPtr pos 3
@@ -262,7 +262,7 @@ docComment =
262262 in
263263 cok () newState
264264
265− MultiTab -> cerr newRow newCol (E.DeclSpace E.HasTab)
266− MultiEndless -> cerr row col E.EndlessDocComment
265+ MultiTab -> cerr newRow newCol toTabError
266+ MultiEndless -> cerr row col toEndlessError
267267 else
268− eerr row col E.DeclDeadend
268+ eerr row col toExpectation