Skip to content

fix(isa-utils): escape control characters in quoted strings #3772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pengqima wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(isa-utils): escape control characters in quoted strings #3772

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions isa-utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,19 @@ pub enum SingleDataValue {
}

pub fn quote(s: &str) -> String {
// TODO more things to quote
format!("\"{}\"", s.replace('\\', "\\\\").replace('\"', "\\\""))
let escaped = s
.chars()
.map(|c| match c {
'\\' => "\\\\".to_string(),
'"' => "\\\"".to_string(),
'\n' => "\\n".to_string(),
'\r' => "\\r".to_string(),
'\t' => "\\t".to_string(),
c if c.is_control() => format!("\\u{{{:x}}}", c as u32),
c => c.to_string(),
})
.collect::<String>();
format!("\"{escaped}\"")
}

pub fn escape_label(l: &str) -> String {
Expand All @@ -31,3 +42,16 @@ pub fn escape_label(l: &str) -> String {
.replace("'", "_quote_")
.replace("*", "_deref_")
}

#[cfg(test)]
mod tests {
use super::quote;

#[test]
fn quote_escapes_control_characters() {
assert_eq!(
quote("line\ncolumn\treturn\r"),
"\"line\\ncolumn\\treturn\\r\""
);
}
}
Loading