@devaloop/devalang 0.0.1-beta.1 → 0.0.1-beta.3

package/rust/core/audio/interpreter/{condition.rs → statements/condition.rs}

@@ -1,71 +1,72 @@
-use devalang_types::Value;
-
-use crate::core::{
-    audio::{
-        engine::AudioEngine, evaluator::evaluate_condition_string,
-        interpreter::driver::execute_audio_block,
-    },
-    parser::statement::Statement,
-    store::{function::FunctionTable, global::GlobalStore, variable::VariableTable},
-};
-
-pub fn interprete_condition_statement(
-    stmt: &Statement,
-    audio_engine: &mut AudioEngine,
-    global_store: &GlobalStore,
-    variable_table: &VariableTable,
-    functions_table: &FunctionTable,
-    base_bpm: f32,
-    base_duration: f32,
-    max_end_time: f32,
-    cursor_time: f32,
-) -> (f32, f32) {
-    let cur_time = cursor_time;
-    let max_time = max_end_time;
-
-    let mut current = stmt.value.clone();
-
-    loop {
-        let Value::Map(map) = current else {
-            break;
-        };
-
-        let should_execute = match map.get("condition") {
-            Some(Value::Boolean(b)) => *b,
-            Some(Value::String(expr)) => evaluate_condition_string(expr, &variable_table.clone()),
-            Some(_) => false,
-            None => true,
-        };
-
-        if should_execute {
-            if let Some(Value::Block(block)) = map.get("body") {
-                let (new_max, cursor_time) = execute_audio_block(
-                    audio_engine,
-                    global_store,
-                    variable_table.clone(),
-                    functions_table.clone(),
-                    block,
-                    base_bpm,
-                    base_duration,
-                    max_time,
-                    cur_time,
-                );
-                return (new_max, cursor_time);
-            } else {
-                break;
-            }
-        }
-
-        // Advance to the next condition
-        match map.get("next") {
-            Some(Value::Map(next_map)) => {
-                current = Value::Map(next_map.clone());
-            }
-            _ => {
-                break;
-            }
-        }
-    }
-
-    (max_end_time, cursor_time)
-}
+use devalang_types::Value;
+
+use crate::core::{
+    audio::{
+        engine::AudioEngine, evaluator::evaluate_condition_string,
+        interpreter::driver::execute_audio_block,
+    },
+    parser::statement::Statement,
+    store::global::GlobalStore,
+};
+use devalang_types::store::{FunctionTable, VariableTable};
+
+pub fn interprete_condition_statement(
+    stmt: &Statement,
+    audio_engine: &mut AudioEngine,
+    global_store: &GlobalStore,
+    variable_table: &VariableTable,
+    functions_table: &FunctionTable,
+    base_bpm: f32,
+    base_duration: f32,
+    max_end_time: f32,
+    cursor_time: f32,
+) -> (f32, f32) {
+    let cur_time = cursor_time;
+    let max_time = max_end_time;
+
+    let mut current = stmt.value.clone();
+
+    loop {
+        let Value::Map(map) = current else {
+            break;
+        };
+
+        let should_execute = match map.get("condition") {
+            Some(Value::Boolean(b)) => *b,
+            Some(Value::String(expr)) => evaluate_condition_string(expr, &variable_table.clone()),
+            Some(_) => false,
+            None => true,
+        };
+
+        if should_execute {
+            if let Some(Value::Block(block)) = map.get("body") {
+                let (new_max, cursor_time) = execute_audio_block(
+                    audio_engine,
+                    global_store,
+                    variable_table.clone(),
+                    functions_table.clone(),
+                    block,
+                    base_bpm,
+                    base_duration,
+                    max_time,
+                    cur_time,
+                );
+                return (new_max, cursor_time);
+            } else {
+                break;
+            }
+        }
+
+        // Advance to the next condition
+        match map.get("next") {
+            Some(Value::Map(next_map)) => {
+                current = Value::Map(next_map.clone());
+            }
+            _ => {
+                break;
+            }
+        }
+    }
+
+    (max_end_time, cursor_time)
+}

package/rust/core/audio/interpreter/{function.rs → statements/function.rs}

@@ -1,26 +1,24 @@
-use crate::core::{
-    parser::statement::{Statement, StatementKind},
-    store::function::{FunctionDef, FunctionTable},
-};
-
-pub fn interprete_function_statement(
-    stmt: &Statement,
-    functions_table: &mut FunctionTable,
-) -> Option<FunctionTable> {
-    if let StatementKind::Function {
-        name,
-        parameters,
-        body,
-    } = &stmt.kind
-    {
-        functions_table.add_function(FunctionDef {
-            name: name.clone(),
-            parameters: parameters.clone(),
-            body: body.clone(),
-        });
-
-        return Some(functions_table.clone());
-    }
-
-    None
-}
+use crate::core::parser::statement::{Statement, StatementKind};
+use devalang_types::store::{FunctionDef, FunctionTable};
+
+pub fn interprete_function_statement(
+    stmt: &Statement,
+    functions_table: &mut FunctionTable,
+) -> Option<FunctionTable> {
+    if let StatementKind::Function {
+        name,
+        parameters,
+        body,
+    } = &stmt.kind
+    {
+        functions_table.add_function(FunctionDef {
+            name: name.clone(),
+            parameters: parameters.clone(),
+            body: body.clone(),
+        });
+
+        return Some(functions_table.clone());
+    }
+
+    None
+}

package/rust/core/audio/interpreter/{let_.rs → statements/let_.rs}

@@ -1,38 +1,36 @@
-use crate::core::{
-    parser::statement::{Statement, StatementKind},
-    store::variable::VariableTable,
-};
-use devalang_types::Value;
-
-pub fn interprete_let_statement(
-    stmt: &Statement,
-    variable_table: &mut VariableTable,
-) -> Option<VariableTable> {
-    if let StatementKind::Let { name } = &stmt.kind {
-        // If RHS is a string and looks like an expression, evaluate it
-        let evaluated = match &stmt.value {
-            Value::String(s) if s.contains("$env") || s.contains("$math") => {
-                // We don't have direct env here; use defaults or infer from table
-                let bpm = if let Some(Value::Number(n)) = variable_table.get("bpm") {
-                    *n
-                } else {
-                    120.0
-                };
-                // Try to infer beat from time-based variables if any, else 0.0
-                let beat = if let Some(Value::Number(n)) = variable_table.get("beat") {
-                    *n
-                } else {
-                    0.0
-                };
-                crate::core::audio::evaluator::evaluate_rhs_into_value(s, variable_table, bpm, beat)
-            }
-            other => other.clone(),
-        };
-
-        variable_table.set(name.to_string(), evaluated);
-
-        return Some(variable_table.clone());
-    }
-
-    None
-}
+use crate::core::parser::statement::{Statement, StatementKind};
+use devalang_types::Value;
+use devalang_types::store::VariableTable;
+
+pub fn interprete_let_statement(
+    stmt: &Statement,
+    variable_table: &mut VariableTable,
+) -> Option<VariableTable> {
+    if let StatementKind::Let { name } = &stmt.kind {
+        // If RHS is a string and looks like an expression, evaluate it
+        let evaluated = match &stmt.value {
+            Value::String(s) if s.contains("$env") || s.contains("$math") => {
+                // We don't have direct env here; use defaults or infer from table
+                let bpm = if let Some(Value::Number(n)) = variable_table.get("bpm") {
+                    *n
+                } else {
+                    120.0
+                };
+                // Try to infer beat from time-based variables if any, else 0.0
+                let beat = if let Some(Value::Number(n)) = variable_table.get("beat") {
+                    *n
+                } else {
+                    0.0
+                };
+                crate::core::audio::evaluator::evaluate_rhs_into_value(s, variable_table, bpm, beat)
+            }
+            other => other.clone(),
+        };
+
+        variable_table.set(name.to_string(), evaluated);
+
+        return Some(variable_table.clone());
+    }
+
+    None
+}

package/rust/core/audio/interpreter/{load.rs → statements/load.rs}

@@ -1,19 +1,17 @@
-use devalang_types::Value;
-
-use crate::core::{
-    parser::statement::{Statement, StatementKind},
-    store::variable::VariableTable,
-};
-
-pub fn interprete_load_statement(
-    stmt: &Statement,
-    variable_table: &mut VariableTable,
-) -> Option<VariableTable> {
-    if let StatementKind::Load { source, alias } = &stmt.kind {
-        variable_table.set(alias.to_string(), Value::Sample(source.clone()));
-
-        return Some(variable_table.clone());
-    }
-
-    None
-}
+use devalang_types::Value;
+
+use crate::core::parser::statement::{Statement, StatementKind};
+use devalang_types::store::VariableTable;
+
+pub fn interprete_load_statement(
+    stmt: &Statement,
+    variable_table: &mut VariableTable,
+) -> Option<VariableTable> {
+    if let StatementKind::Load { source, alias } = &stmt.kind {
+        variable_table.set(alias.to_string(), Value::Sample(source.clone()));
+
+        return Some(variable_table.clone());
+    }
+
+    None
+}

package/rust/core/audio/interpreter/{loop_.rs → statements/loop_.rs}

@@ -1,114 +1,115 @@
-use devalang_types::Value;
-
-use crate::core::{
-    audio::{engine::AudioEngine, interpreter::driver::execute_audio_block},
-    parser::statement::Statement,
-    store::{function::FunctionTable, global::GlobalStore, variable::VariableTable},
-};
-
-pub fn interprete_loop_statement(
-    stmt: &Statement,
-    audio_engine: &mut AudioEngine,
-    global_store: &GlobalStore,
-    variable_table: &VariableTable,
-    functions_table: &FunctionTable,
-    base_bpm: f32,
-    base_duration: f32,
-    max_end_time: f32,
-    cursor_time: f32,
-) -> (f32, f32) {
-    if let Value::Map(loop_value) = &stmt.value {
-        // Foreach form: { foreach: Identifier(name), array: Array([...]), body: Block }
-        if let (
-            Some(Value::Identifier(var_name)),
-            Some(Value::Array(items)),
-            Some(Value::Block(loop_body)),
-        ) = (
-            loop_value.get("foreach"),
-            loop_value.get("array"),
-            loop_value.get("body"),
-        ) {
-            let engine = audio_engine;
-            let mut cur_time = cursor_time;
-            let mut max_time = max_end_time;
-
-            for item in items {
-                let mut scoped_vars = variable_table.clone();
-                scoped_vars.set(var_name.clone(), item.clone());
-
-                let (block_end_time, new_cursor) = execute_audio_block(
-                    engine,
-                    global_store,
-                    scoped_vars,
-                    functions_table.clone(),
-                    loop_body,
-                    base_bpm,
-                    base_duration,
-                    max_time,
-                    cur_time,
-                );
-
-                cur_time = new_cursor.max(block_end_time);
-                max_time = max_time.max(cur_time);
-            }
-
-            return (max_time, cur_time);
-        }
-
-        let loop_count = match loop_value.get("iterator") {
-            Some(Value::Number(n)) => *n as usize,
-            Some(Value::Identifier(ident)) => {
-                if let Some(Value::Number(n)) = variable_table.get(ident) {
-                    *n as usize
-                } else {
-                    eprintln!("❌ Loop iterator must be a number, found: {:?}", ident);
-                    return (max_end_time, cursor_time);
-                }
-            }
-            _ => {
-                eprintln!(
-                    "❌ Loop iterator must be a number, found: {:?}",
-                    loop_value.get("iterator")
-                );
-                return (max_end_time, cursor_time);
-            }
-        };
-
-        let loop_body = match loop_value.get("body") {
-            Some(Value::Block(body)) => body.clone(),
-            _ => {
-                eprintln!(
-                    "❌ Loop body must be a block, found: {:?}",
-                    loop_value.get("body")
-                );
-                return (max_end_time, cursor_time);
-            }
-        };
-
-        let engine = audio_engine;
-        let mut cur_time = cursor_time;
-        let mut max_time = max_end_time;
-
-        for _ in 0..loop_count {
-            let (block_end_time, new_cursor) = execute_audio_block(
-                engine,
-                global_store,
-                variable_table.clone(),
-                functions_table.clone(),
-                &loop_body,
-                base_bpm,
-                base_duration,
-                max_time,
-                cur_time,
-            );
-
-            cur_time = new_cursor.max(block_end_time);
-            max_time = max_time.max(cur_time);
-        }
-
-        return (max_time, cur_time);
-    }
-
-    eprintln!("❌ Loop statement value is not a map");
-    (max_end_time, cursor_time)
-}
+use devalang_types::Value;
+
+use crate::core::{
+    audio::{engine::AudioEngine, interpreter::driver::execute_audio_block},
+    parser::statement::Statement,
+    store::global::GlobalStore,
+};
+use devalang_types::store::{FunctionTable, VariableTable};
+
+pub fn interprete_loop_statement(
+    stmt: &Statement,
+    audio_engine: &mut AudioEngine,
+    global_store: &GlobalStore,
+    variable_table: &VariableTable,
+    functions_table: &FunctionTable,
+    base_bpm: f32,
+    base_duration: f32,
+    max_end_time: f32,
+    cursor_time: f32,
+) -> (f32, f32) {
+    if let Value::Map(loop_value) = &stmt.value {
+        // Foreach form: { foreach: Identifier(name), array: Array([...]), body: Block }
+        if let (
+            Some(Value::Identifier(var_name)),
+            Some(Value::Array(items)),
+            Some(Value::Block(loop_body)),
+        ) = (
+            loop_value.get("foreach"),
+            loop_value.get("array"),
+            loop_value.get("body"),
+        ) {
+            let engine = audio_engine;
+            let mut cur_time = cursor_time;
+            let mut max_time = max_end_time;
+
+            for item in items {
+                let mut scoped_vars = variable_table.clone();
+                scoped_vars.set(var_name.clone(), item.clone());
+
+                let (block_end_time, new_cursor) = execute_audio_block(
+                    engine,
+                    global_store,
+                    scoped_vars,
+                    functions_table.clone(),
+                    loop_body,
+                    base_bpm,
+                    base_duration,
+                    max_time,
+                    cur_time,
+                );
+
+                cur_time = new_cursor.max(block_end_time);
+                max_time = max_time.max(cur_time);
+            }
+
+            return (max_time, cur_time);
+        }
+
+        let loop_count = match loop_value.get("iterator") {
+            Some(Value::Number(n)) => *n as usize,
+            Some(Value::Identifier(ident)) => {
+                if let Some(Value::Number(n)) = variable_table.get(ident) {
+                    *n as usize
+                } else {
+                    eprintln!("❌ Loop iterator must be a number, found: {:?}", ident);
+                    return (max_end_time, cursor_time);
+                }
+            }
+            _ => {
+                eprintln!(
+                    "❌ Loop iterator must be a number, found: {:?}",
+                    loop_value.get("iterator")
+                );
+                return (max_end_time, cursor_time);
+            }
+        };
+
+        let loop_body = match loop_value.get("body") {
+            Some(Value::Block(body)) => body.clone(),
+            _ => {
+                eprintln!(
+                    "❌ Loop body must be a block, found: {:?}",
+                    loop_value.get("body")
+                );
+                return (max_end_time, cursor_time);
+            }
+        };
+
+        let engine = audio_engine;
+        let mut cur_time = cursor_time;
+        let mut max_time = max_end_time;
+
+        for _ in 0..loop_count {
+            let (block_end_time, new_cursor) = execute_audio_block(
+                engine,
+                global_store,
+                variable_table.clone(),
+                functions_table.clone(),
+                &loop_body,
+                base_bpm,
+                base_duration,
+                max_time,
+                cur_time,
+            );
+
+            cur_time = new_cursor.max(block_end_time);
+            max_time = max_time.max(cur_time);
+        }
+
+        return (max_time, cur_time);
+    }
+
+    eprintln!("❌ Loop statement value is not a map");
+    (max_end_time, cursor_time)
+}

package/rust/core/audio/interpreter/statements/mod.rs

@@ -0,0 +1,12 @@
+pub mod arrow_call;
+pub mod automate;
+pub mod call;
+pub mod condition;
+pub mod function;
+pub mod let_;
+pub mod load;
+pub mod loop_;
+pub mod sleep;
+pub mod spawn;
+pub mod tempo;
+pub mod trigger;

package/rust/core/audio/interpreter/{sleep.rs → statements/sleep.rs}

@@ -1,28 +1,28 @@
-use crate::core::parser::statement::Statement;
-use devalang_types::Value;
-
-pub fn interprete_sleep_statement(
-    stmt: &Statement,
-    cursor_time: f32,
-    max_end_time: f32,
-) -> (f32, f32) {
-    let duration_secs = match &stmt.value {
-        Value::Number(ms) => *ms / 1000.0,
-        Value::String(s) if s.ends_with("ms") => s
-            .trim_end_matches("ms")
-            .parse::<f32>()
-            .map(|ms| ms / 1000.0)
-            .unwrap_or_else(|_| {
-                eprintln!("❌ Invalid sleep value (ms): {}", s);
-                0.0
-            }),
-        other => {
-            eprintln!("❌ Invalid sleep value: {:?}", other);
-            0.0
-        }
-    };
-
-    let new_cursor = cursor_time + duration_secs;
-    let new_max = max_end_time.max(new_cursor);
-    (new_cursor, new_max)
-}
+use crate::core::parser::statement::Statement;
+use devalang_types::Value;
+
+pub fn interprete_sleep_statement(
+    stmt: &Statement,
+    cursor_time: f32,
+    max_end_time: f32,
+) -> (f32, f32) {
+    let duration_secs = match &stmt.value {
+        Value::Number(ms) => *ms / 1000.0,
+        Value::String(s) if s.ends_with("ms") => s
+            .trim_end_matches("ms")
+            .parse::<f32>()
+            .map(|ms| ms / 1000.0)
+            .unwrap_or_else(|_| {
+                eprintln!("❌ Invalid sleep value (ms): {}", s);
+                0.0
+            }),
+        other => {
+            eprintln!("❌ Invalid sleep value: {:?}", other);
+            0.0
+        }
+    };
+
+    let new_cursor = cursor_time + duration_secs;
+    let new_max = max_end_time.max(new_cursor);
+    (new_cursor, new_max)
+}