Skip to content

fix(interpreter): parse arithmetic parameter operators at first operator #1472

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

Merged
chaliy merged 1 commit into from
Apr 25, 2026
Merged

fix(interpreter): parse arithmetic parameter operators at first operator #1472

Show file tree
Hide file tree
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
84 changes: 46 additions & 38 deletions crates/bashkit/src/interpreter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8927,45 +8927,39 @@ impl Interpreter {
/// Expand a parameter expansion with operators inside arithmetic context.
/// Handles common cases like ${var%%-*}, ${var##prefix}, etc.
fn expand_param_op_in_arithmetic(&self, inner: &str) -> String {
// ${var%%pattern} — remove longest suffix
if let Some(pos) = inner.find("%%") {
let name = &inner[..pos];
let pattern = &inner[pos + 2..];
let value = self.expand_variable(name);
return self.remove_pattern(&value, pattern, false, true);
}
// ${var%pattern} — remove shortest suffix
if let Some(pos) = inner.find('%') {
let name = &inner[..pos];
let pattern = &inner[pos + 1..];
let value = self.expand_variable(name);
return self.remove_pattern(&value, pattern, false, false);
}
// ${var##pattern} — remove longest prefix
if let Some(pos) = inner.find("##") {
let name = &inner[..pos];
let pattern = &inner[pos + 2..];
let value = self.expand_variable(name);
return self.remove_pattern(&value, pattern, true, true);
}
// ${var#pattern} — remove shortest prefix (but not ${#var} length)
if let Some(pos) = inner.find('#')
&& pos > 0
{
let name = &inner[..pos];
let pattern = &inner[pos + 1..];
let value = self.expand_variable(name);
return self.remove_pattern(&value, pattern, true, false);
}
// ${var:-default}
if let Some(pos) = inner.find(":-") {
let name = &inner[..pos];
let default = &inner[pos + 2..];
let value = self.expand_variable(name);
if value.is_empty() {
return default.to_string();
for (pos, ch) in inner.char_indices() {
match ch {
'%' => {
let name = &inner[..pos];
let value = self.expand_variable(name);
if inner[pos..].starts_with("%%") {
let pattern = &inner[pos + 2..];
return self.remove_pattern(&value, pattern, false, true);
}
let pattern = &inner[pos + 1..];
return self.remove_pattern(&value, pattern, false, false);
}
'#' if pos > 0 => {
let name = &inner[..pos];
let value = self.expand_variable(name);
if inner[pos..].starts_with("##") {
let pattern = &inner[pos + 2..];
return self.remove_pattern(&value, pattern, true, true);
}
let pattern = &inner[pos + 1..];
return self.remove_pattern(&value, pattern, true, false);
}
':' if inner[pos..].starts_with(":-") => {
let name = &inner[..pos];
let default = &inner[pos + 2..];
let value = self.expand_variable(name);
if value.is_empty() {
return default.to_string();
}
return value;
}
_ => {}
}
return value;
}
// Fallback
self.expand_variable(inner)
Expand Down Expand Up @@ -11668,6 +11662,20 @@ mod tests {
assert_eq!(result.exit_code, 0);
}

#[tokio::test]
async fn test_arithmetic_base_suffix_pattern_with_double_percent() {
let result = run_script("var='123foo%%bar'; echo $(( 10#${var%foo%%bar} ))").await;
assert_eq!(result.exit_code, 0);
assert_eq!(result.stdout.trim(), "123");
}

#[tokio::test]
async fn test_arithmetic_base_prefix_pattern_with_double_hash() {
let result = run_script("var='foo##bar123'; echo $(( 10#${var#foo##bar} ))").await;
assert_eq!(result.exit_code, 0);
assert_eq!(result.stdout.trim(), "123");
}

#[tokio::test]
async fn test_arithmetic_nested_array_index_depth_guard() {
let mut expr = "1".to_string();
Expand Down
17 changes: 17 additions & 0 deletions crates/bashkit/tests/spec_cases/bash/arithmetic-base-expansion.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,20 @@ echo $(( 10#${x} ))
### expect
99
### end


### arithmetic_base_suffix_pattern_contains_double_percent
# Ensure %% inside pattern is not treated as operator location
var="123foo%%bar"
echo $(( 10#${var%foo%%bar} ))
### expect
123
### end

### arithmetic_base_prefix_pattern_contains_double_hash
# Ensure ## inside pattern is not treated as operator location
var="foo##bar123"
echo $(( 10#${var#foo##bar} ))
### expect
123
### end
Loading