openharmony/third_party_rust_regex
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_regex synced 2025-04-12 07:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

syntax: fix printing bug for HIR

Browse Source 
This commit fixes a bug in the HIR printer where it would not correctly
escape meta characters in character classes.
This commit is contained in:
Andrew Gallant 2018-07-18 09:15:27 -04:00
parent 7ebe4ae02d
commit 24c7770b80
No known key found for this signature in database
GPG Key ID: B2E3A4923F8B0D44
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
regex-syntax/src/hir/print.rs
View File

@ -228,7 +228,7 @@ impl<'p, W: fmt::Write> Writer<'p, W> {
fn write_literal_byte(&mut self, b: u8) -> fmt::Result {
let c = b as char;
if c <= 0x7F as char && !c.is_control() && !c.is_whitespace() {
self.wtr.write_char(c)
self.write_literal_char(c)
} else {
write!(self.wtr, "(?-u:\\x{:02X})", b)
}
@ -237,7 +237,7 @@ impl<'p, W: fmt::Write> Writer<'p, W> {
fn write_literal_class_byte(&mut self, b: u8) -> fmt::Result {
let c = b as char;
if c <= 0x7F as char && !c.is_control() && !c.is_whitespace() {
self.wtr.write_char(c)
self.write_literal_char(c)
} else {
write!(self.wtr, "\\x{:02X}", b)
}
@ -267,6 +267,10 @@ mod tests {
let mut printer = Printer::new();
let mut dst = String::new();
printer.print(&hir, &mut dst).unwrap();
// Check that the result is actually valid.
builder.build().parse(&dst).unwrap();
assert_eq!(expected, dst);
}
@ -291,6 +295,18 @@ mod tests {
roundtrip(r"(?-u)[a]", r"(?-u:[a])");
roundtrip(r"(?-u)[a-z]", r"(?-u:[a-z])");
roundtrip_bytes(r"(?-u)[a-\xFF]", r"(?-u:[a-\xFF])");
// The following test that the printer escapes meta characters
// in character classes.
roundtrip(r"[\[]", r"[\[]");
roundtrip(r"[Z-_]", r"[Z-_]");
roundtrip(r"[Z-_--Z]", r"[\[-_]");
// The following test that the printer escapes meta characters
// in byte oriented character classes.
roundtrip_bytes(r"(?-u)[\[]", r"(?-u:[\[])");
roundtrip_bytes(r"(?-u)[Z-_]", r"(?-u:[Z-_])");
roundtrip_bytes(r"(?-u)[Z-_--Z]", r"(?-u:[\[-_])");
}
#[test]