Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions docs.ab
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env amber

import { file_glob } from "std/fs"
import { echo_colored } from "std/env"

Expand Down
25 changes: 14 additions & 11 deletions src/modules/expression/binop/range.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ impl TranslateModule for Range {
}

impl Range {
// ShellCheck SC2046: We use `paste -sd " " -` to ensure space-separated output for compliance
/// Generate a range at compile time when both operands are numeric literals
fn generate_compile_time_range(&self, from_val: isize, to_val: isize) -> FragmentKind {
if self.neq && from_val == to_val {
Expand Down Expand Up @@ -102,19 +103,19 @@ impl Range {
let expr = if self.neq {
fragments!(
"if [ ", from_var.clone(), " -gt ", to_var.clone(), " ]; then ",
"seq -f \"%.0f\" -- ", from_var.clone(), " -1 ", reverse_to.clone(), " || seq -- ", from_var.clone(), " -1 ", reverse_to, "; ",
"(seq -f \"%.0f\" -- ", from_var.clone(), " -1 ", reverse_to.clone(), " || seq -- ", from_var.clone(), " -1 ", reverse_to, ") | paste -sd \" \" -; ",
"elif [ ", from_var.clone(), " -lt ", to_var.clone(), " ]; then ",
"seq -f \"%.0f\" -- ", from_var.clone(), " ", forward_to.clone(), " || seq -- ", from_var.clone(), " ", forward_to, "; fi"
"(seq -f \"%.0f\" -- ", from_var.clone(), " ", forward_to.clone(), " || seq -- ", from_var.clone(), " ", forward_to, ") | paste -sd \" \" -; fi"
)
} else {
fragments!(
"if [ ", from_var.clone(), " -gt ", to_var.clone(), " ]; then ",
"seq -f \"%.0f\" -- ", from_var.clone(), " -1 ", reverse_to.clone(), " || seq -- ", from_var.clone(), " -1 ", reverse_to, "; ",
"else seq -f \"%.0f\" -- ", from_var.clone(), " ", forward_to.clone(), " || seq -- ", from_var.clone(), " ", forward_to, "; fi"
"(seq -f \"%.0f\" -- ", from_var.clone(), " -1 ", reverse_to.clone(), " || seq -- ", from_var.clone(), " -1 ", reverse_to, ") | paste -sd \" \" -; ",
"else (seq -f \"%.0f\" -- ", from_var.clone(), " ", forward_to.clone(), " || seq -- ", from_var.clone(), " ", forward_to, ") | paste -sd \" \" -; fi"
)
};

SubprocessFragment::new(expr).with_quotes(false).to_frag()
SubprocessFragment::new(expr).to_frag()
}

/// Check if this is a reverse range (start > end or equal with exclusive operator)
Expand All @@ -126,20 +127,22 @@ impl Range {
fn generate_forward_seq(&self, from_val: isize, to_val: isize) -> FragmentKind {
let to_adjusted = if self.neq { to_val - 1 } else { to_val };
let expr = fragments!(
"seq -f \"%.0f\" -- ", raw_fragment!("{}", from_val), " ", raw_fragment!("{}", to_adjusted),
" || seq -- ", raw_fragment!("{}", from_val), " ", raw_fragment!("{}", to_adjusted)
"(seq -f \"%.0f\" -- ", raw_fragment!("{}", from_val), " ", raw_fragment!("{}", to_adjusted),
" || seq -- ", raw_fragment!("{}", from_val), " ", raw_fragment!("{}", to_adjusted),
") | paste -sd \" \" -"
);
SubprocessFragment::new(expr).with_quotes(false).to_frag()
SubprocessFragment::new(expr).to_frag()
}

/// Generate a reverse seq command for compile-time ranges
fn generate_reverse_seq(&self, from_val: isize, to_val: isize) -> FragmentKind {
let to_adjusted = if self.neq { to_val + 1 } else { to_val };
let expr = fragments!(
"seq -f \"%.0f\" -- ", raw_fragment!("{}", from_val), " -1 ", raw_fragment!("{}", to_adjusted),
" || seq -- ", raw_fragment!("{}", from_val), " -1 ", raw_fragment!("{}", to_adjusted)
"(seq -f \"%.0f\" -- ", raw_fragment!("{}", from_val), " -1 ", raw_fragment!("{}", to_adjusted),
" || seq -- ", raw_fragment!("{}", from_val), " -1 ", raw_fragment!("{}", to_adjusted),
") | paste -sd \" \" -"
);
SubprocessFragment::new(expr).with_quotes(false).to_frag()
SubprocessFragment::new(expr).to_frag()
}

/// Adjust the end value for forward ranges (runtime)
Expand Down
13 changes: 12 additions & 1 deletion src/modules/expression/literal/text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,18 @@ impl TranslateModule for Text {
fn translate(&self, meta: &mut TranslateMetadata) -> FragmentKind {
// Translate all interpolations
let interps = self.interps.iter()
.map(|item| item.translate(meta).with_quotes(false))
.map(|item| {
let frag = item.translate(meta).with_quotes(false);
// ShellCheck SC2145: Use [*] for array interpolation to treat array as single string argument
if let FragmentKind::VarExpr(mut var) = frag {
if var.kind.is_array() {
var = var.with_array_to_string(true);
}
var.to_frag()
} else {
frag
}
})
.collect::<Vec<FragmentKind>>();
InterpolableFragment::new(self.strings.clone(), interps, InterpolableRenderType::StringLiteral).to_frag()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ for (( i_14=${__range_start_14}; i_14 * ${__dir_14} < ${__range_end_14} * ${__di
echo "${i_14}"
done
echo "Expressions (${start_0}+1)..(${end_1}*1)"
__range_start_15="$(( ${start_0} + 1 ))"
__range_end_15="$(( ${end_1} * 1 ))"
__range_start_15="$(( start_0 + 1 ))"
__range_end_15="$(( end_1 * 1 ))"
__dir_15=$(( ${__range_start_15} <= ${__range_end_15} ? 1 : -1 ))
for (( i_15=${__range_start_15}; i_15 * ${__dir_15} < ${__range_end_15} * ${__dir_15}; i_15+=${__dir_15} )); do
echo "${i_15}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ expression: output
a_0=10
while :
do
if [ "$(( ${a_0} <= 0 ))" != 0 ]; then
if [ "$(( a_0 <= 0 ))" != 0 ]; then
break
fi
echo "${a_0}"
a_0="$(( ${a_0} - 1 ))"
a_0="$(( a_0 - 1 ))"
done
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -119,6 +120,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -163,6 +164,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -119,6 +120,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -163,6 +164,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -122,6 +123,7 @@ Block(
default_value: None,
is_quoted: false,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -242,6 +244,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -327,6 +330,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -371,6 +375,7 @@ Block(
default_value: None,
is_quoted: false,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand All @@ -387,6 +392,7 @@ Block(
default_value: None,
is_quoted: false,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -427,6 +433,7 @@ Block(
default_value: None,
is_quoted: false,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: Some(
Index(
Expand All @@ -442,6 +449,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -119,6 +120,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -163,6 +164,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -119,6 +120,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -163,6 +164,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -119,6 +120,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down Expand Up @@ -163,6 +164,7 @@ Block(
default_value: None,
is_quoted: true,
is_array_to_string: false,
is_math_var: false,
render_type: BashValue,
index: None,
},
Expand Down
Loading