mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-13 16:15:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove repetitive to_string in parse_escaped_char

Browse source
This commit is contained in:
harupy 2023-01-03 13:35:47 +09:00
parent 50f191b2c7
commit b6647b0171
1 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

56
parser/src/string_parser.rs
View file

@ -130,39 +130,43 @@ impl<'a> StringParser<'a> {
fn parse_escaped_char(&mut self) -> Result<String, LexicalError> { fn parse_escaped_char(&mut self) -> Result<String, LexicalError> {
match self.next_char() { match self.next_char() {
Some(c) => Ok(match c { Some(c) => {
'\\' => '\\'.to_string(), let char = match c {
'\'' => '\''.to_string(), '\\' => '\\',
'\"' => '"'.to_string(), '\'' => '\'',
'\n' => "".to_string(), '\"' => '"',
'a' => '\x07'.to_string(), 'a' => '\x07',
'b' => '\x08'.to_string(), 'b' => '\x08',
'f' => '\x0c'.to_string(), 'f' => '\x0c',
'n' => '\n'.to_string(), 'n' => '\n',
'r' => '\r'.to_string(), 'r' => '\r',
't' => '\t'.to_string(), 't' => '\t',
'v' => '\x0b'.to_string(), 'v' => '\x0b',
o @ '0'..='7' => self.parse_octet(o).to_string(), o @ '0'..='7' => self.parse_octet(o),
'x' => self.parse_unicode_literal(2)?.to_string(), 'x' => self.parse_unicode_literal(2)?,
'u' if !self.kind.is_bytes() => self.parse_unicode_literal(4)?.to_string(), 'u' if !self.kind.is_bytes() => self.parse_unicode_literal(4)?,
'U' if !self.kind.is_bytes() => self.parse_unicode_literal(8)?.to_string(), 'U' if !self.kind.is_bytes() => self.parse_unicode_literal(8)?,
'N' if !self.kind.is_bytes() => self.parse_unicode_name()?.to_string(), 'N' if !self.kind.is_bytes() => self.parse_unicode_name()?,
// Special cases where the escape sequence is not a single character
'\n' => return Ok("".to_string()),
c => { c => {
if self.kind.is_bytes() && !c.is_ascii() { if self.kind.is_bytes() && !c.is_ascii() {
return Err(LexicalError::new( return Err(LexicalError {
LexicalErrorType::OtherError( error: LexicalErrorType::OtherError(
"bytes can only contain ASCII literal characters".to_owned(), "bytes can only contain ASCII literal characters".to_owned(),
), ),
self.get_pos(), location: self.get_pos(),
)); });
} }
format!("\\{c}") return Ok(format!("\\{c}"));
} }
};
Ok(char.to_string())
}
None => Err(LexicalError {
error: LexicalErrorType::StringError,
location: self.get_pos(),
}), }),
None => Err(LexicalError::new(
LexicalErrorType::StringError,
self.get_pos(),
)),
} }
} }