steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strings.parser: better string error messages.

locals-and-roots
John Benediktsson 2016-04-04 14:48:05 -07:00
parent 1f063155a9
commit 42c56a2de1
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/strings/parser/parser.factor
View File

@ -1,8 +1,8 @@
! Copyright (C) 2008, 2009 Slava Pestov, Doug Coleman. ! Copyright (C) 2008, 2009 Slava Pestov, Doug Coleman.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays assocs combinators kernel kernel.private USING: accessors assocs combinators continuations kernel
lexer math math.parser namespaces sbufs sequences splitting kernel.private lexer math math.parser namespaces sbufs sequences
strings ; splitting strings ;
IN: strings.parser IN: strings.parser
ERROR: bad-escape char ; ERROR: bad-escape char ;
@ -151,12 +151,21 @@ DEFER: (parse-full-string)
(parse-full-string) (parse-full-string)
] if* ] if*
] [ ] [
throw-unexpected-eof "Unterminated string" throw
] if ; ] if ;
: rewind-on-error ( quot -- )
lexer get [ line>> ] [ line-text>> ] [ column>> ] tri
[
lexer get [ column<< ] [ line-text<< ] [ line<< ] tri
rethrow
] 3curry recover ; inline
PRIVATE> PRIVATE>
: parse-full-string ( -- str ) : parse-full-string ( -- str )
[
SBUF" " clone [ SBUF" " clone [
lexer get (parse-full-string) lexer get (parse-full-string)
] keep unescape-string ; ] keep unescape-string
] rewind-on-error ;