encounter
/
cwdemangle
mirror of https://github.com/encounter/cwdemangle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fix for __init

This commit is contained in:
Luke Street 2022-09-03 13:09:40 -04:00
parent f858991236
commit fb83e84bcd
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib.rs
View File

@ -253,10 +253,17 @@ pub fn demangle(mut str: &str) -> Option<String> {
str = &str[2..]; str = &str[2..];
} }
{ {
let idx = str.rfind("__")?; let idx = str.find("__")?;
let (fn_name_out, rest) = str.split_at(idx); let (fn_name_out, mut rest) = str.split_at(idx);
if special { if special {
if fn_name_out == "init" {
// Special case for double __
let rest_idx = rest[2..].find("__")?;
fn_name = str[..rest_idx + 6].to_string();
rest = &rest[rest_idx + 2..];
} else {
fn_name = fn_name_out.to_string(); fn_name = fn_name_out.to_string();
}
} else { } else {
let (name, args) = demangle_template_args(fn_name_out)?; let (name, args) = demangle_template_args(fn_name_out)?;
fn_name = format!("{}{}", name, args); fn_name = format!("{}{}", name, args);
@ -507,5 +514,9 @@ mod tests {
demangle("__init__mNull__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"), demangle("__init__mNull__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"),
Some("rstl::basic_string<char, rstl::char_traits<char>, rstl::rmemory_allocator>::__init__mNull".to_string()) Some("rstl::basic_string<char, rstl::char_traits<char>, rstl::rmemory_allocator>::__init__mNull".to_string())
); );
assert_eq!(
demangle("__dt__26__partial_array_destructorFv"),
Some("__partial_array_destructor::~__partial_array_destructor(void)".to_string())
);
} }
} }