Feat: adapt cagire to doux v0.0.12

crates/forth/src/vm.rs

@@ -1446,22 +1446,38 @@ impl Forth {
                     stack.push(Value::Str(s.into(), None));
                 }
                 Op::ModEnv => {
-                    ensure(stack, 1)?;
-                    let values = std::mem::take(stack);
-                    let mut floats = Vec::with_capacity(values.len());
-                    for v in &values {
-                        floats.push(v.as_float()?);
-                    }
-                    if floats.len() < 3 || (floats.len() - 1) % 2 != 0 {
-                        return Err("env expects: start target1 dur1 [target2 dur2 ...]".into());
-                    }
-                    let step_dur = ctx.step_duration();
+                    let release = pop_float(stack)? * ctx.step_duration();
+                    let sustain = pop_float(stack)?;
+                    let decay = pop_float(stack)? * ctx.step_duration();
+                    let attack = pop_float(stack)? * ctx.step_duration();
+                    let max = pop_float(stack)?;
+                    let min = pop_float(stack)?;
                     use std::fmt::Write;
                     let mut s = String::new();
-                    let _ = write!(&mut s, "{}", floats[0]);
-                    for pair in floats[1..].chunks(2) {
-                        let _ = write!(&mut s, ">{}:{}", pair[0], pair[1] * step_dur);
-                    }
+                    let _ = write!(&mut s, "{min}^{max}:{attack}:{decay}:{sustain}:{release}");
+                    stack.push(Value::Str(s.into(), None));
+                }
+
+                Op::ModEnvAd => {
+                    let decay = pop_float(stack)? * ctx.step_duration();
+                    let attack = pop_float(stack)? * ctx.step_duration();
+                    let max = pop_float(stack)?;
+                    let min = pop_float(stack)?;
+                    use std::fmt::Write;
+                    let mut s = String::new();
+                    let _ = write!(&mut s, "{min}^{max}:{attack}:{decay}:0:0");
+                    stack.push(Value::Str(s.into(), None));
+                }
+
+                Op::ModEnvAdr => {
+                    let release = pop_float(stack)? * ctx.step_duration();
+                    let decay = pop_float(stack)? * ctx.step_duration();
+                    let attack = pop_float(stack)? * ctx.step_duration();
+                    let max = pop_float(stack)?;
+                    let min = pop_float(stack)?;
+                    use std::fmt::Write;
+                    let mut s = String::new();
+                    let _ = write!(&mut s, "{min}^{max}:{attack}:{decay}:0:{release}");
                     stack.push(Value::Str(s.into(), None));
                 }
 
@@ -1713,27 +1729,7 @@ fn extract_dev_param(params: &[(&str, Value)]) -> u8 {
 fn is_tempo_scaled_param(name: &str) -> bool {
     matches!(
         name,
-        "attack"
-            | "decay"
-            | "release"
-            | "lpa"
-            | "lpd"
-            | "lpr"
-            | "hpa"
-            | "hpd"
-            | "hpr"
-            | "bpa"
-            | "bpd"
-            | "bpr"
-            | "patt"
-            | "pdec"
-            | "prel"
-            | "fma"
-            | "fmd"
-            | "fmr"
-            | "glide"
-            | "chorusdelay"
-            | "duration"
+        "attack" | "decay" | "release" | "envdelay" | "hold" | "chorusdelay"
     )
 }