idris-lang/Idris2
1
1
Fork 0
mirror of https://github.com/idris-lang/Idris2.git synced 2024-11-23 22:22:07 +03:00
Code Issues Projects Releases Wiki Activity

Show the line and column in diagnostic message

Browse Source 
This also updates the error message of some common combinators
This commit is contained in:
André Videla 2021-11-02 00:32:24 +00:00 committed by Andre Videla
parent 3063218d46
commit 7f932036e9
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/contrib/Data/String/Parser.idr
View File

@ -77,8 +77,18 @@ export
parseT : Functor m => ParseT m a -> String -> m (Either String (a, Int))
parseT p str = map (\case
OK r s => Right (r, s.pos)
Fail i err => Left $ fastConcat ["Parse failed at position ", show i, ": ", err])
Fail i err => Left $ let (line, col) = computePos i str in "Parse failed at position \{show line}-\{show col}: \{err}")
(p.runParser (S str 0 (strLength str)))
where
computePosAcc : Int -> List Char -> (Int, Int) -> (Int, Int)
computePosAcc 0 input acc = acc
computePosAcc n [] acc = acc
computePosAcc n ('\n' :: is) (line, col) = computePosAcc (n - 1) is (line + 1, 0)
computePosAcc n (i :: is) (line, col) = computePosAcc (n - 1) is (line, col + 1)
-- compute the position as line:col
computePos : Int -> String -> (Int, Int)
computePos pos input = computePosAcc pos (fastUnpack input) (0,0)
||| Run a parser in a pure function
||| Returns a tuple of the result and final position on success.
@ -149,8 +159,8 @@ satisfy f = P $ \s => pure $ if s.pos < s.maxPos
then let ch = assert_total $ strIndex s.input s.pos in
if f ch
then OK ch (S s.input (s.pos + 1) s.maxPos)
else Fail s.pos "satisfy"
else Fail s.pos "satisfy"
else Fail s.pos "could not satisfy predicate"
else Fail s.pos "could not satisfy predicate"
||| Succeeds if the string `str` follows.
export
@ -173,24 +183,24 @@ eos = P $ \s => pure $ if s.pos == s.maxPos
||| Succeeds if the next char is `c`
export
char : Applicative m => Char -> ParseT m Char
char c = satisfy (== c) <?> "char " ++ show c
char c = satisfy (== c) <?> "expected \{show c}"
||| Parses a space character
export
space : Applicative m => ParseT m Char
space = satisfy isSpace <?> "space"
space = satisfy isSpace <?> "expected space"
||| Parses a letter or digit (a character between \'0\' and \'9\').
||| Returns the parsed character.
export
alphaNum : Applicative m => ParseT m Char
alphaNum = satisfy isAlphaNum <?> "letter or digit"
alphaNum = satisfy isAlphaNum <?> "expected letter or digit"
||| Parses a letter (an upper case or lower case character). Returns the
||| parsed character.
export
letter : Applicative m => ParseT m Char
letter = satisfy isAlpha <?> "letter"
letter = satisfy isAlpha <?> "expected letter"
mutual
||| Succeeds if `p` succeeds, will continue to match `p` until it fails
@ -288,7 +298,7 @@ lexeme p = p <* spaces
export
covering
token : Monad m => String -> ParseT m ()
token s = lexeme (skip $ string s) <?> "token " ++ show s
token s = lexeme (skip $ string s) <?> "expected token " ++ show s
||| Matches a single digit
export

8
tests/chez/chez027/expected
View File

@ -1,14 +1,14 @@
1/1: Building StringParser (StringParser.idr)
Main> hiya
2
Parse failed at position 0: satisfy
Parse failed at position 0: Not good
Parse failed at position 0-0: could not satisfy predicate
Parse failed at position 0-0: Not good
['7', '6', '6', '7', '7', '5']
['6', '3', '5', '5', '3']
"887"
"XML Comment"
"<- Complicated -- XML -- Comment ->"
Parse failed at position 24: end of string reached - "-->" not found
Parse failed at position 0-24: end of string reached - "-->" not found
"123"
""
True
@ -17,5 +17,5 @@ False
['a', 12, 'b', 3, 'c']
['a', 'b', 'c', 'd']
()
Parse failed at position 0: Purposefully changed OK to Fail
Parse failed at position 0-0: Purposefully changed OK to Fail
Main> Bye for now!