From 90f8137b0daefcd4e7fd42d37b90205fc8a31547 Mon Sep 17 00:00:00 2001 From: Erin Date: Sun, 24 Apr 2022 23:29:15 +0200 Subject: [PATCH] Implemented string unicode escapes --- ablescript/src/lexer.rs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/ablescript/src/lexer.rs b/ablescript/src/lexer.rs index e95d663..5271724 100644 --- a/ablescript/src/lexer.rs +++ b/ablescript/src/lexer.rs @@ -138,7 +138,24 @@ fn get_value(lexer: &mut Lexer) -> Option { fn get_string(lexer: &mut Lexer) -> Option { lexer.bump(lexer.remainder().find("*/")?); - let string = lexer.slice()[2..].to_owned(); + + let mut string = String::new(); + let mut slice = &lexer.slice()[2..]; + while let Some(escape_start) = slice.find('"') { + string.push_str(&slice.get(..escape_start)?); + slice = &slice.get(escape_start + 1..)?; + + let escape_end = slice.find('"')?; + string.push( + u32::from_str_radix(&slice.get(..escape_end)?, 12) + .ok() + .and_then(char::from_u32)?, + ); + + slice = &slice.get(escape_end + 1..)?; + } + + string.push_str(&slice); lexer.bump(2); Some(string)