moritz
/
shulkerscript-lang
mirror of https://github.com/moritz-hoelting/shulkerscript-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix error in macro string parsing from string

This commit is contained in:
Moritz Hölting 2025-03-15 09:31:08 +01:00
parent 6dde4b41c1
commit 713977390d
1 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/transpile/util.rs
View File

@ -121,9 +121,9 @@ impl FromStr for MacroString {
let pos = s.find("$("); let pos = s.find("$(");
if pos.is_some_and(|pos| s[pos..].contains(')')) { if pos.is_some_and(|pos| s[pos..].contains(')')) {
let mut parts = Vec::new(); let mut parts = Vec::new();
let mut s = s; let mut rem = s;
while let Some(pos) = s.find("$(") { while let Some(pos) = rem.find("$(") {
let (before, after) = s.split_at(pos); let (before, after) = rem.split_at(pos);
let last_macro_index = after let last_macro_index = after
.char_indices() .char_indices()
@ -135,25 +135,46 @@ impl FromStr for MacroString {
match last_macro_index { match last_macro_index {
Some(last_macro_index) if after[last_macro_index + 1..].starts_with(')') => { Some(last_macro_index) if after[last_macro_index + 1..].starts_with(')') => {
if !before.is_empty() { if !before.is_empty() {
parts.push(MacroStringPart::String(before.to_string())); match parts.last_mut() {
Some(MacroStringPart::String(last)) => {
*last += before;
}
_ => {
parts.push(MacroStringPart::String(before.to_string()));
}
}
} }
parts.push(MacroStringPart::MacroUsage( parts.push(MacroStringPart::MacroUsage(
after[2..=last_macro_index].to_string(), after[2..=last_macro_index].to_string(),
)); ));
s = &after[last_macro_index + 2..]; rem = &after[last_macro_index + 2..];
if s.is_empty() { if rem.is_empty() {
break; break;
} }
} }
_ => { _ => {
parts.push(MacroStringPart::String(s.to_string())); let part = &rem[..=pos + 1];
s = ""; match parts.last_mut() {
break; Some(MacroStringPart::String(last)) => {
*last += part;
}
_ => {
parts.push(MacroStringPart::String(part.to_string()));
}
}
rem = &rem[pos + 2..];
} }
} }
} }
if !s.is_empty() { if !rem.is_empty() {
parts.push(MacroStringPart::String(s.to_string())); match parts.last_mut() {
Some(MacroStringPart::String(last)) => {
*last += rem;
}
_ => {
parts.push(MacroStringPart::String(rem.to_string()));
}
}
} }
if parts if parts
.iter() .iter()
@ -261,5 +282,13 @@ mod tests {
MacroStringPart::MacroUsage("c".to_string()), MacroStringPart::MacroUsage("c".to_string()),
]) ])
); );
assert_eq!(
MacroString::from_str("Hello, $(world! $(world)!").unwrap(),
MacroString::MacroString(vec![
MacroStringPart::String("Hello, $(world! ".to_string()),
MacroStringPart::MacroUsage("world".to_string()),
MacroStringPart::String("!".to_string()),
])
);
} }
} }