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

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

@@ -1,102 +1,105 @@
-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_spawn_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::Spawn { name, args } => {
-            let mut local_engine = AudioEngine::new(audio_engine.module_name.clone());
-
-            // Function 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());
-                }
-
-                let (spawn_max, _) = execute_audio_block(
-                    &mut local_engine,
-                    global_store,
-                    local_vars,
-                    functions.clone(),
-                    &func.body,
-                    base_bpm,
-                    base_duration,
-                    0.0,
-                    0.0,
-                );
-
-                audio_engine.merge_with(local_engine);
-                return (spawn_max.max(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") {
-                        let (spawn_max, _) = execute_audio_block(
-                            &mut local_engine,
-                            global_store,
-                            variable_table.clone(),
-                            functions.clone(),
-                            &body,
-                            base_bpm,
-                            base_duration,
-                            0.0,
-                            0.0,
-                        );
-                        audio_engine.merge_with(local_engine);
-                        return (spawn_max.max(max_end_time), cursor_time);
-                    }
-                }
-            }
-
-            eprintln!("❌ Function or group '{}' not found", name);
-        }
-
-        _ => eprintln!("❌ interprete_spawn_statement expected Spawn, 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_spawn_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::Spawn { name, args } => {
+            let mut local_engine = AudioEngine::new(audio_engine.module_name.clone());
+
+            // Function 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());
+                }
+
+                let (spawn_max, _) = execute_audio_block(
+                    &mut local_engine,
+                    global_store,
+                    local_vars,
+                    functions.clone(),
+                    &func.body,
+                    base_bpm,
+                    base_duration,
+                    0.0,
+                    0.0,
+                );
+
+                audio_engine.merge_with(local_engine);
+                return (spawn_max.max(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") {
+                        let (spawn_max, _) = execute_audio_block(
+                            &mut local_engine,
+                            global_store,
+                            variable_table.clone(),
+                            functions.clone(),
+                            &body,
+                            base_bpm,
+                            base_duration,
+                            0.0,
+                            0.0,
+                        );
+                        audio_engine.merge_with(local_engine);
+                        return (spawn_max.max(max_end_time), cursor_time);
+                    }
+                }
+            }
+
+            eprintln!("❌ Function or group '{}' not found", name);
+        }
+
+        _ => eprintln!(
+            "❌ interprete_spawn_statement expected Spawn, 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
+}

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

@@ -1,16 +1,19 @@
-use crate::core::{ parser::statement::{ Statement, StatementKind }, shared::value::Value };
-
-pub fn interprete_tempo_statement(stmt: &Statement) -> Option<(f32, f32)> {
-    if let StatementKind::Tempo = &stmt.kind {
-        if let Value::Number(bpm) = &stmt.value {
-            let bpm = *bpm as f32;
-            let duration = 60.0 / bpm;
-
-            return Some((bpm, duration));
-        } else {
-            eprintln!("❌ Invalid tempo value: {:?}", stmt.value);
-        }
-    }
-
-    None
-}
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    shared::value::Value,
+};
+
+pub fn interprete_tempo_statement(stmt: &Statement) -> Option<(f32, f32)> {
+    if let StatementKind::Tempo = &stmt.kind {
+        if let Value::Number(bpm) = &stmt.value {
+            let bpm = *bpm as f32;
+            let duration = 60.0 / bpm;
+
+            return Some((bpm, duration));
+        } else {
+            eprintln!("❌ Invalid tempo value: {:?}", stmt.value);
+        }
+    }
+
+    None
+}