greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix string literal escape parsing

Browse Source
This commit is contained in:
Greg Shuflin 2021-11-21 01:54:34 -08:00
parent d2b5deb802
commit 884c8e515f
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
schala-lang/src/parsing/peg_parser.rs
View File

@ -423,7 +423,7 @@ peg::parser! {
rule pattern_literal() -> Pattern = rule pattern_literal() -> Pattern =
"true" { Pattern::Literal(PatternLiteral::BoolPattern(true)) } / "true" { Pattern::Literal(PatternLiteral::BoolPattern(true)) } /
"false" { Pattern::Literal(PatternLiteral::BoolPattern(false)) } / "false" { Pattern::Literal(PatternLiteral::BoolPattern(false)) } /
s:bare_string_literal() { Pattern::Literal(PatternLiteral::StringPattern(Rc::new(s.to_string()))) } / s:bare_string_literal() { Pattern::Literal(PatternLiteral::StringPattern(Rc::new(s))) } /
sign:("-"?) num:(float_literal() / nat_literal()) { sign:("-"?) num:(float_literal() / nat_literal()) {
let neg = sign.is_some(); let neg = sign.is_some();
Pattern::Literal(PatternLiteral::NumPattern { neg, num }) Pattern::Literal(PatternLiteral::NumPattern { neg, num })
@ -447,19 +447,18 @@ peg::parser! {
} }
rule string_literal() -> ExpressionKind = rule string_literal() -> ExpressionKind =
prefix:identifier()? s:bare_string_literal(){ ExpressionKind::StringLiteral{ s: Rc::new(s.to_string()), prefix:identifier()? s:bare_string_literal(){ ExpressionKind::StringLiteral{ s: Rc::new(s),
prefix: prefix.map(rc_string) prefix: prefix.map(rc_string)
} } } }
rule bare_string_literal() -> &'input str = rule bare_string_literal() -> String =
"\"" s:$(string_component()*) "\"" { s } "\"" chars:string_component()* "\"" { chars.into_iter().collect::<String>() }
rule string_component() -> &'input str = rule string_component() -> char =
r#"\\"# { "\\" } / !(r#"""# / r#"\"#) ch:$([_]) { ch.chars().next().unwrap() } /
r#"\""# { "\"" } / r#"\u{"# value:$(['0'..='9' | 'a'..='f' | 'A'..='F']+) "}" { char::from_u32(u32::from_str_radix(value, 16).unwrap()).unwrap() } /
r#"\t"# { "\t" } / r#"\n"# { '\n' } / r#"\t"# { '\t' } / r#"\""# { '"' } / r#"\\"# { '\\' } /
r#"\n"# { "\n" } / expected!("Valid escape sequence")
ch:$([^ '"' ]) { ch }
rule bool_literal() -> ExpressionKind = rule bool_literal() -> ExpressionKind =
"true" { ExpressionKind::BoolLiteral(true) } / "false" { ExpressionKind::BoolLiteral(false) } "true" { ExpressionKind::BoolLiteral(true) } / "false" { ExpressionKind::BoolLiteral(false) }

3
schala-lang/src/parsing/test.rs
View File

@ -189,8 +189,7 @@ fn string_literals() {
r#"b"some bytestring""#, r#"b"some bytestring""#,
expr(StringLiteral { s: rc("some bytestring"), prefix: Some(rc("b")) }) expr(StringLiteral { s: rc("some bytestring"), prefix: Some(rc("b")) })
); );
//NOTE I'm not 100% sure this case is correct, but I'll deal with it later assert_expr!(r#""Do \n \" escapes work\t""#, expr(strlit("Do \n \" escapes work\t")));
//assert_expr!(r#""Do \n \" escapes work\t""#, expr(StringLiteral(rc("Do \n \" escapes work\t"))));
} }
#[test] #[test]