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

Fix interpolated string position.

Browse Source
This commit is contained in:
Stephen Chung 2022-02-10 14:51:31 +08:00
parent 775bd6fb35
commit 3050e38c5e
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/tokenizer.rs
View File

@ -226,11 +226,9 @@ impl Position {
/// Print this [`Position`] for debug purposes. /// Print this [`Position`] for debug purposes.
#[inline] #[inline]
pub(crate) fn debug_print(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result { pub(crate) fn debug_print(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result {
#[cfg(not(feature = "no_position"))]
if !self.is_none() { if !self.is_none() {
write!(_f, " @ {:?}", self)?; write!(_f, " @ {:?}", self)?;
} }
Ok(()) Ok(())
} }
} }
@ -1131,11 +1129,12 @@ pub fn parse_string_literal(
verbatim: bool, verbatim: bool,
allow_line_continuation: bool, allow_line_continuation: bool,
allow_interpolation: bool, allow_interpolation: bool,
) -> Result<(Box<str>, bool), (LexError, Position)> { ) -> Result<(Box<str>, bool, Position), (LexError, Position)> {
let mut result = String::with_capacity(12); let mut result = String::with_capacity(12);
let mut escape = String::with_capacity(12); let mut escape = String::with_capacity(12);
let start = *pos; let start = *pos;
let mut first_char = Position::NONE;
let mut interpolated = false; let mut interpolated = false;
#[cfg(not(feature = "no_position"))] #[cfg(not(feature = "no_position"))]
let mut skip_whitespace_until = 0; let mut skip_whitespace_until = 0;
@ -1188,6 +1187,16 @@ pub fn parse_string_literal(
} }
} }
// Close wrapper
if termination_char == next_char && escape.is_empty() {
state.is_within_text_terminated_by = None;
break;
}
if first_char.is_none() {
first_char = *pos;
}
match next_char { match next_char {
// \r - ignore if followed by \n // \r - ignore if followed by \n
'\r' if stream.peek_next().map(|ch| ch == '\n').unwrap_or(false) => (), '\r' if stream.peek_next().map(|ch| ch == '\n').unwrap_or(false) => (),
@ -1264,12 +1273,6 @@ pub fn parse_string_literal(
result.push(termination_char) result.push(termination_char)
} }
// Close wrapper
_ if termination_char == next_char && escape.is_empty() => {
state.is_within_text_terminated_by = None;
break;
}
// Verbatim // Verbatim
'\n' if verbatim => { '\n' if verbatim => {
assert_eq!(escape, "", "verbatim strings should not have any escapes"); assert_eq!(escape, "", "verbatim strings should not have any escapes");
@ -1327,7 +1330,7 @@ pub fn parse_string_literal(
} }
} }
Ok((result.into(), interpolated)) Ok((result.into(), interpolated, first_char))
} }
/// Consume the next character. /// Consume the next character.
@ -1462,11 +1465,9 @@ fn get_next_token_inner(
// Within text? // Within text?
if let Some(ch) = state.is_within_text_terminated_by.take() { if let Some(ch) = state.is_within_text_terminated_by.take() {
let start_pos = *pos;
return parse_string_literal(stream, state, pos, ch, true, false, true).map_or_else( return parse_string_literal(stream, state, pos, ch, true, false, true).map_or_else(
|(err, err_pos)| Some((Token::LexError(err), err_pos)), |(err, err_pos)| Some((Token::LexError(err), err_pos)),
|(result, interpolated)| { |(result, interpolated, start_pos)| {
if interpolated { if interpolated {
Some((Token::InterpolatedString(result), start_pos)) Some((Token::InterpolatedString(result), start_pos))
} else { } else {
@ -1677,7 +1678,7 @@ fn get_next_token_inner(
return parse_string_literal(stream, state, pos, c, true, false, true).map_or_else( return parse_string_literal(stream, state, pos, c, true, false, true).map_or_else(
|(err, err_pos)| Some((Token::LexError(err), err_pos)), |(err, err_pos)| Some((Token::LexError(err), err_pos)),
|(result, interpolated)| { |(result, interpolated, ..)| {
if interpolated { if interpolated {
Some((Token::InterpolatedString(result), start_pos)) Some((Token::InterpolatedString(result), start_pos))
} else { } else {