kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Better position of string literal errors.

Browse Source
This commit is contained in:
Stephen Chung 2020-09-22 19:18:06 +08:00
parent 41a16c9cf7
commit 02f37870e5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/token.rs
View File

@ -752,8 +752,10 @@ pub fn parse_string_literal(
let mut result: StaticVec<char> = Default::default(); let mut result: StaticVec<char> = Default::default();
let mut escape: StaticVec<char> = Default::default(); let mut escape: StaticVec<char> = Default::default();
let start = *pos;
loop { loop {
let next_char = stream.get_next().ok_or((LERR::UnterminatedString, *pos))?; let next_char = stream.get_next().ok_or((LERR::UnterminatedString, start))?;
pos.advance(); pos.advance();
@ -838,17 +840,19 @@ pub fn parse_string_literal(
ch if enclosing_char == ch && escape.is_empty() => break, ch if enclosing_char == ch && escape.is_empty() => break,
// Unknown escape sequence // Unknown escape sequence
_ if !escape.is_empty() => { ch if !escape.is_empty() => {
escape.push(ch);
return Err(( return Err((
LERR::MalformedEscapeSequence(escape.into_iter().collect()), LERR::MalformedEscapeSequence(escape.into_iter().collect()),
*pos, *pos,
)) ));
} }
// Cannot have new-lines inside string literals // Cannot have new-lines inside string literals
'\n' => { '\n' => {
pos.rewind(); pos.rewind();
return Err((LERR::UnterminatedString, *pos)); return Err((LERR::UnterminatedString, start));
} }
// All other characters // All other characters