@devaloop/devalang 0.0.1-alpha.15 → 0.0.1-alpha.16

package/rust/core/audio/interpreter/arrow_call.rs

@@ -1,187 +1,198 @@
-use crate::core::{
-    audio::engine::AudioEngine,
-    parser::statement::{ Statement, StatementKind },
-    shared::value::Value,
-    store::variable::VariableTable,
-};
-
-use std::collections::HashMap;
-
-pub fn interprete_call_arrow_statement(
-    stmt: &Statement,
-    audio_engine: &mut AudioEngine,
-    variable_table: &VariableTable,
-    base_bpm: f32,
-    base_duration: f32,
-    max_end_time: &mut f32,
-    mut cursor_time: Option<&mut f32>,
-    update_cursor: bool
-) -> (f32, f32) {
-    let cursor_copy = cursor_time
-        .as_ref()
-        .map(|c| **c)
-        .unwrap_or(0.0);
-
-    if let StatementKind::ArrowCall { target, method, args } = &stmt.kind {
-        let Some(Value::Statement(synth_stmt)) = variable_table.get(target) else {
-            println!("❌ Synth '{}' not found in variable table", target);
-            return (*max_end_time, cursor_copy);
-        };
-
-        let Value::Map(synth_map) = &synth_stmt.value else {
-            println!("❌ Invalid synth statement for '{}', expected a map.", target);
-            return (*max_end_time, cursor_copy);
-        };
-
-        let Some(Value::String(entity)) = synth_map.get("entity") else {
-            println!("❌ Missing 'entity' key in synth '{}'.", target);
-            return (*max_end_time, cursor_copy);
-        };
-
-        if entity != "synth" {
-            println!("❌ '{}' is not a synth, entity is '{}'.", target, entity);
-            return (*max_end_time, cursor_copy);
-        }
-
-        let Some(Value::Map(value_map)) = synth_map.get("value") else {
-            println!("❌ Missing 'value' map in synth '{}'.", target);
-            return (*max_end_time, cursor_copy);
-        };
-
-        let Some(Value::String(waveform)) = value_map.get("waveform") else {
-            println!("❌ Missing or invalid 'waveform' in synth '{}'.", target);
-            return (*max_end_time, cursor_copy);
-        };
-
-        let Some(Value::Map(params)) = value_map.get("parameters") else {
-            println!("❌ Missing or invalid 'parameters' in synth '{}'.", target);
-            return (*max_end_time, cursor_copy);
-        };
-
-        // Synth parameters
-    let synth_params = params.clone();
-    let amp = extract_f32(&synth_params, "amp", base_bpm).unwrap_or(1.0);
-
-        if method == "note" {
-            let filtered_args: Vec<_> = args
-                .iter()
-                .filter(|arg| !matches!(arg, Value::Unknown))
-                .collect();
-
-            let Some(Value::Identifier(note_name)) = filtered_args.get(0).map(|v| (*v).clone()) else {
-                println!("❌ Invalid or missing argument for 'note' method on '{}'.", target);
-                return (*max_end_time, cursor_copy);
-            };
-
-            let mut note_params = HashMap::new();
-            if let Some(arg1) = filtered_args.get(1) {
-                match (*arg1).clone() {
-                    Value::Map(map) => {
-                        for (key, value) in map {
-                            note_params.insert(key, value);
-                        }
-                    }
-                    _ => {}
-                }
-            }
-
-            // Note parameters and calculations
-            let amp_note = extract_f32(&note_params, "amp", base_bpm).unwrap_or(amp);
-            let duration_ms = extract_f32(&note_params, "duration", base_bpm)
-                .unwrap_or(base_duration * 1000.0);
-            
-            let duration_secs = duration_ms / 1000.0;
-            let final_freq = note_to_freq(&note_name);
-            let start_time = cursor_copy;
-            let end_time = start_time + duration_secs;
-
-            // Fetch automation map if present:
-            // - Global (per-synth): key "<target>__automation" => map with key "params"
-            // - Per-note: note parameter "automate" => map
-            let auto_key = format!("{}__automation", target);
-            let synth_automation = match variable_table.get(&auto_key) {
-                Some(Value::Map(map)) => match map.get("params") {
-                    Some(Value::Map(p)) => Some(p.clone()),
-                    _ => None,
-                },
-                _ => None,
-            };
-
-            let note_automation = match note_params.get("automate") {
-                Some(Value::Map(m)) => Some(m.clone()),
-                _ => None,
-            };
-
-            // Merge: per-note overrides synth automation per key (volume/pan/pitch)
-            let automation = match (synth_automation, note_automation) {
-                (Some(mut a), Some(n)) => { for (k, v) in n { a.insert(k, v); } Some(a) },
-                (None, Some(n)) => Some(n),
-                (Some(a), None) => Some(a),
-                _ => None,
-            };
-
-            audio_engine.insert_note(
-                waveform.clone(),
-                final_freq,
-                amp_note,
-                start_time * 1000.0,
-                duration_ms,
-                synth_params,
-                note_params,
-                automation
-            );
-
-            *max_end_time = (*max_end_time).max(end_time);
-
-            if update_cursor {
-                if let Some(c) = cursor_time.as_mut() {
-                    **c = end_time;
-                }
-            }
-
-            return (*max_end_time, end_time);
-        } else {
-            println!("❌ Unknown method '{}' on synth '{}'.", method, target);
-        }
-    }
-
-    (*max_end_time, cursor_copy)
-}
-
-fn extract_f32(map: &HashMap<String, Value>, key: &str, base_bpm: f32) -> Option<f32> {
-    map.get(key).and_then(|v| {
-        match v {
-            Value::Number(n) => Some(*n),
-            Value::Beat(beat_str) => {
-                let parts: Vec<&str> = beat_str.split('/').collect();
-                if parts.len() == 2 {
-                    let numerator = parts[0].parse::<f32>().ok()?;
-                    let denominator = parts[1].parse::<f32>().ok()?;
-
-                    Some((numerator / denominator) * ((60.0 / base_bpm) * 1000.0))
-                } else {
-                    None
-                }
-            }
-            _ => None,
-        }
-    })
-}
-
-fn note_to_freq(note: &str) -> f32 {
-    let notes = vec!["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"];
-
-    if note.len() < 2 || note.len() > 3 {
-        return 440.0;
-    }
-
-    let (name, octave_str) = note.split_at(note.len() - 1);
-    let semitone = notes
-        .iter()
-        .position(|&n| n == name)
-        .unwrap_or(9) as i32;
-    let octave = octave_str.parse::<i32>().unwrap_or(4);
-    let midi_note = (octave + 1) * 12 + semitone;
-
-    440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
-}
+use crate::core::{
+    audio::engine::AudioEngine,
+    parser::statement::{Statement, StatementKind},
+    shared::value::Value,
+    store::variable::VariableTable,
+};
+
+use std::collections::HashMap;
+
+pub fn interprete_call_arrow_statement(
+    stmt: &Statement,
+    audio_engine: &mut AudioEngine,
+    variable_table: &VariableTable,
+    base_bpm: f32,
+    base_duration: f32,
+    max_end_time: &mut f32,
+    mut cursor_time: Option<&mut f32>,
+    update_cursor: bool,
+) -> (f32, f32) {
+    let cursor_copy = cursor_time.as_ref().map(|c| **c).unwrap_or(0.0);
+
+    if let StatementKind::ArrowCall {
+        target,
+        method,
+        args,
+    } = &stmt.kind
+    {
+        let Some(Value::Statement(synth_stmt)) = variable_table.get(target) else {
+            println!("❌ Synth '{}' not found in variable table", target);
+            return (*max_end_time, cursor_copy);
+        };
+
+        let Value::Map(synth_map) = &synth_stmt.value else {
+            println!(
+                "❌ Invalid synth statement for '{}', expected a map.",
+                target
+            );
+            return (*max_end_time, cursor_copy);
+        };
+
+        let Some(Value::String(entity)) = synth_map.get("entity") else {
+            println!("❌ Missing 'entity' key in synth '{}'.", target);
+            return (*max_end_time, cursor_copy);
+        };
+
+        if entity != "synth" {
+            println!("❌ '{}' is not a synth, entity is '{}'.", target, entity);
+            return (*max_end_time, cursor_copy);
+        }
+
+        let Some(Value::Map(value_map)) = synth_map.get("value") else {
+            println!("❌ Missing 'value' map in synth '{}'.", target);
+            return (*max_end_time, cursor_copy);
+        };
+
+        let Some(Value::String(waveform)) = value_map.get("waveform") else {
+            println!("❌ Missing or invalid 'waveform' in synth '{}'.", target);
+            return (*max_end_time, cursor_copy);
+        };
+
+        let Some(Value::Map(params)) = value_map.get("parameters") else {
+            println!("❌ Missing or invalid 'parameters' in synth '{}'.", target);
+            return (*max_end_time, cursor_copy);
+        };
+
+        // Synth parameters
+        let synth_params = params.clone();
+        let amp = extract_f32(&synth_params, "amp", base_bpm).unwrap_or(1.0);
+
+        if method == "note" {
+            let filtered_args: Vec<_> = args
+                .iter()
+                .filter(|arg| !matches!(arg, Value::Unknown))
+                .collect();
+
+            let Some(Value::Identifier(note_name)) = filtered_args.get(0).map(|v| (*v).clone())
+            else {
+                println!(
+                    "❌ Invalid or missing argument for 'note' method on '{}'.",
+                    target
+                );
+                return (*max_end_time, cursor_copy);
+            };
+
+            let mut note_params = HashMap::new();
+            if let Some(arg1) = filtered_args.get(1) {
+                match (*arg1).clone() {
+                    Value::Map(map) => {
+                        for (key, value) in map {
+                            note_params.insert(key, value);
+                        }
+                    }
+                    _ => {}
+                }
+            }
+
+            // Note parameters and calculations
+            let amp_note = extract_f32(&note_params, "amp", base_bpm).unwrap_or(amp);
+            let duration_ms =
+                extract_f32(&note_params, "duration", base_bpm).unwrap_or(base_duration * 1000.0);
+
+            let duration_secs = duration_ms / 1000.0;
+            let final_freq = note_to_freq(&note_name);
+            let start_time = cursor_copy;
+            let end_time = start_time + duration_secs;
+
+            // Fetch automation map if present:
+            // - Global (per-synth): key "<target>__automation" => map with key "params"
+            // - Per-note: note parameter "automate" => map
+            let auto_key = format!("{}__automation", target);
+            let synth_automation = match variable_table.get(&auto_key) {
+                Some(Value::Map(map)) => match map.get("params") {
+                    Some(Value::Map(p)) => Some(p.clone()),
+                    _ => None,
+                },
+                _ => None,
+            };
+
+            let note_automation = match note_params.get("automate") {
+                Some(Value::Map(m)) => Some(m.clone()),
+                _ => None,
+            };
+
+            // Merge: per-note overrides synth automation per key (volume/pan/pitch)
+            let automation = match (synth_automation, note_automation) {
+                (Some(mut a), Some(n)) => {
+                    for (k, v) in n {
+                        a.insert(k, v);
+                    }
+                    Some(a)
+                }
+                (None, Some(n)) => Some(n),
+                (Some(a), None) => Some(a),
+                _ => None,
+            };
+
+            audio_engine.insert_note(
+                waveform.clone(),
+                final_freq,
+                amp_note,
+                start_time * 1000.0,
+                duration_ms,
+                synth_params,
+                note_params,
+                automation,
+            );
+
+            *max_end_time = (*max_end_time).max(end_time);
+
+            if update_cursor {
+                if let Some(c) = cursor_time.as_mut() {
+                    **c = end_time;
+                }
+            }
+
+            return (*max_end_time, end_time);
+        } else {
+            println!("❌ Unknown method '{}' on synth '{}'.", method, target);
+        }
+    }
+
+    (*max_end_time, cursor_copy)
+}
+
+fn extract_f32(map: &HashMap<String, Value>, key: &str, base_bpm: f32) -> Option<f32> {
+    map.get(key).and_then(|v| match v {
+        Value::Number(n) => Some(*n),
+        Value::Beat(beat_str) => {
+            let parts: Vec<&str> = beat_str.split('/').collect();
+            if parts.len() == 2 {
+                let numerator = parts[0].parse::<f32>().ok()?;
+                let denominator = parts[1].parse::<f32>().ok()?;
+
+                Some((numerator / denominator) * ((60.0 / base_bpm) * 1000.0))
+            } else {
+                None
+            }
+        }
+        _ => None,
+    })
+}
+
+fn note_to_freq(note: &str) -> f32 {
+    let notes = vec![
+        "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
+    ];
+
+    if note.len() < 2 || note.len() > 3 {
+        return 440.0;
+    }
+
+    let (name, octave_str) = note.split_at(note.len() - 1);
+    let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
+    let octave = octave_str.parse::<i32>().unwrap_or(4);
+    let midi_note = (octave + 1) * 12 + semitone;
+
+    440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
+}

package/rust/core/audio/interpreter/call.rs

@@ -1,95 +1,98 @@
-use crate::core::{
-    audio::{engine::AudioEngine, interpreter::driver::execute_audio_block},
-    parser::statement::{Statement, StatementKind},
-    shared::value::Value,
-    store::{function::FunctionTable, global::GlobalStore, variable::VariableTable},
-};
-
-pub fn interprete_call_statement(
-    stmt: &Statement,
-    audio_engine: &mut AudioEngine,
-    variable_table: &VariableTable,
-    functions: &FunctionTable,
-    global_store: &GlobalStore,
-    base_bpm: f32,
-    base_duration: f32,
-    max_end_time: f32,
-    cursor_time: f32,
-) -> (f32, f32) {
-    match &stmt.kind {
-        StatementKind::Call { name, args } => {
-            // Classic function call case
-            if let Some(func) = functions.functions.get(name) {
-                if func.parameters.len() != args.len() {
-                    eprintln!(
-                        "❌ Function '{}' expects {} args, got {}",
-                        name,
-                        func.parameters.len(),
-                        args.len()
-                    );
-                    return (max_end_time, cursor_time);
-                }
-
-                let mut local_vars = VariableTable::with_parent(variable_table.clone());
-                for (param, arg) in func.parameters.iter().zip(args) {
-                    local_vars.set(param.clone(), arg.clone());
-                }
-
-                return execute_audio_block(
-                    audio_engine,
-                    global_store,
-                    local_vars,
-                    functions.clone(),
-                    &func.body,
-                    base_bpm,
-                    base_duration,
-                    max_end_time,
-                    cursor_time,
-                );
-            }
-
-            // Group case
-            if let Some(group_stmt) = find_group(name, variable_table, global_store) {
-                if let Value::Map(map) = &group_stmt.value {
-                    if let Some(Value::Block(body)) = map.get("body") {
-                        return execute_audio_block(
-                            audio_engine,
-                            global_store,
-                            variable_table.clone(),
-                            functions.clone(),
-                            &body,
-                            base_bpm,
-                            base_duration,
-                            max_end_time,
-                            cursor_time,
-                        );
-                    }
-                }
-            }
-
-            eprintln!("❌ Function or group '{}' not found", name);
-        }
-
-        _ => eprintln!("❌ interprete_call_statement expected Call, got {:?}", stmt.kind),
-    }
-
-    (max_end_time, cursor_time)
-}
-
-fn find_group<'a>(
-    name: &str,
-    variable_table: &'a VariableTable,
-    global_store: &'a GlobalStore,
-) -> Option<&'a Statement> {
-    if let Some(Value::Statement(stmt_box)) = variable_table.get(name) {
-        if let StatementKind::Group = stmt_box.kind {
-            return Some(stmt_box);
-        }
-    }
-    if let Some(Value::Statement(stmt_box)) = global_store.variables.variables.get(name) {
-        if let StatementKind::Group = stmt_box.kind {
-            return Some(stmt_box);
-        }
-    }
-    None
-}
+use crate::core::{
+    audio::{engine::AudioEngine, interpreter::driver::execute_audio_block},
+    parser::statement::{Statement, StatementKind},
+    shared::value::Value,
+    store::{function::FunctionTable, global::GlobalStore, variable::VariableTable},
+};
+
+pub fn interprete_call_statement(
+    stmt: &Statement,
+    audio_engine: &mut AudioEngine,
+    variable_table: &VariableTable,
+    functions: &FunctionTable,
+    global_store: &GlobalStore,
+    base_bpm: f32,
+    base_duration: f32,
+    max_end_time: f32,
+    cursor_time: f32,
+) -> (f32, f32) {
+    match &stmt.kind {
+        StatementKind::Call { name, args } => {
+            // Classic function call case
+            if let Some(func) = functions.functions.get(name) {
+                if func.parameters.len() != args.len() {
+                    eprintln!(
+                        "❌ Function '{}' expects {} args, got {}",
+                        name,
+                        func.parameters.len(),
+                        args.len()
+                    );
+                    return (max_end_time, cursor_time);
+                }
+
+                let mut local_vars = VariableTable::with_parent(variable_table.clone());
+                for (param, arg) in func.parameters.iter().zip(args) {
+                    local_vars.set(param.clone(), arg.clone());
+                }
+
+                return execute_audio_block(
+                    audio_engine,
+                    global_store,
+                    local_vars,
+                    functions.clone(),
+                    &func.body,
+                    base_bpm,
+                    base_duration,
+                    max_end_time,
+                    cursor_time,
+                );
+            }
+
+            // Group case
+            if let Some(group_stmt) = find_group(name, variable_table, global_store) {
+                if let Value::Map(map) = &group_stmt.value {
+                    if let Some(Value::Block(body)) = map.get("body") {
+                        return execute_audio_block(
+                            audio_engine,
+                            global_store,
+                            variable_table.clone(),
+                            functions.clone(),
+                            &body,
+                            base_bpm,
+                            base_duration,
+                            max_end_time,
+                            cursor_time,
+                        );
+                    }
+                }
+            }
+
+            eprintln!("❌ Function or group '{}' not found", name);
+        }
+
+        _ => eprintln!(
+            "❌ interprete_call_statement expected Call, got {:?}",
+            stmt.kind
+        ),
+    }
+
+    (max_end_time, cursor_time)
+}
+
+fn find_group<'a>(
+    name: &str,
+    variable_table: &'a VariableTable,
+    global_store: &'a GlobalStore,
+) -> Option<&'a Statement> {
+    if let Some(Value::Statement(stmt_box)) = variable_table.get(name) {
+        if let StatementKind::Group = stmt_box.kind {
+            return Some(stmt_box);
+        }
+    }
+    if let Some(Value::Statement(stmt_box)) = global_store.variables.variables.get(name) {
+        if let StatementKind::Group = stmt_box.kind {
+            return Some(stmt_box);
+        }
+    }
+    None
+}