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

package/rust/core/preprocessor/processor/handlers.rs

@@ -1,107 +1,107 @@
-use crate::core::{
-    parser::statement::StatementKind, preprocessor::loader::ModuleLoader,
-    store::global::GlobalStore,
-};
-use devalang_types::Value;
-use devalang_utils::path::{normalize_path, resolve_relative_path};
-use std::collections::HashMap;
-
-pub fn process_modules(_module_loader: &ModuleLoader, global_store: &mut GlobalStore) {
-    for module in global_store.modules.values_mut() {
-        let logger = devalang_utils::logger::Logger::new();
-        use devalang_utils::logger::LogLevel;
-
-        for stmt in &module.statements {
-            match &stmt.kind {
-                StatementKind::Let { name } => {
-                    if let Value::Null = stmt.value {
-                        logger.log_message(
-                            LogLevel::Error,
-                            &format!("Variable '{}' is declared but not initialized.", name),
-                        );
-                        module.variable_table.variables.insert(
-                            name.clone(),
-                            Value::StatementKind(Box::new(stmt.kind.clone())),
-                        );
-                        continue;
-                    }
-
-                    if module.variable_table.get(name).is_some() {
-                        logger.log_message(
-                            LogLevel::Error,
-                            &format!("Variable '{}' is already defined in this scope.", name),
-                        );
-                        continue;
-                    }
-
-                    if let Some(module_variable) = module.variable_table.variables.get(name) {
-                        logger.log_message(
-                            LogLevel::Error,
-                            &format!(
-                                "Variable '{}' is already defined globally with value: {:?}",
-                                name, module_variable
-                            ),
-                        );
-                        continue;
-                    }
-
-                    module
-                        .variable_table
-                        .variables
-                        .insert(name.clone(), stmt.value.clone());
-                }
-
-                StatementKind::Load { source, alias } => {
-                    let module_dir = std::path::Path::new(&module.path)
-                        .parent()
-                        .unwrap_or(std::path::Path::new(""));
-                    let resolved_path = normalize_path(module_dir.join(source));
-                    module
-                        .variable_table
-                        .variables
-                        .insert(alias.clone(), Value::Sample(resolved_path));
-                }
-
-                StatementKind::Export { names, source: _ } => {
-                    for name in names {
-                        if let Some(val) = module.variable_table.get(name) {
-                            module.export_table.add_export(name.clone(), val.clone());
-                        }
-                    }
-                }
-
-                StatementKind::Import { names, source } => {
-                    let resolved = resolve_relative_path(&module.path, source);
-                    for name in names {
-                        module
-                            .import_table
-                            .add_import(name.clone(), Value::String(resolved.clone()));
-                    }
-                }
-
-                StatementKind::Group => {
-                    if let Value::Map(map) = &stmt.value {
-                        if let (Some(Value::String(name)), Some(Value::Block(body))) =
-                            (map.get("identifier"), map.get("body"))
-                        {
-                            let mut stored_map = HashMap::new();
-                            stored_map
-                                .insert("identifier".to_string(), Value::String(name.clone()));
-                            stored_map.insert("body".to_string(), Value::Block(body.clone()));
-                            module
-                                .variable_table
-                                .set(name.to_string(), Value::Map(stored_map));
-                        } else {
-                            logger.log_message(
-                                LogLevel::Error,
-                                &format!("Invalid group definition: {:?}", stmt.value),
-                            );
-                        }
-                    }
-                }
-
-                _ => {}
-            }
-        }
-    }
-}
+use crate::core::{
+    parser::statement::StatementKind, preprocessor::loader::ModuleLoader,
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+use devalang_utils::path::{normalize_path, resolve_relative_path};
+use std::collections::HashMap;
+
+pub fn process_modules(_module_loader: &ModuleLoader, global_store: &mut GlobalStore) {
+    for module in global_store.modules.values_mut() {
+        let logger = devalang_utils::logger::Logger::new();
+        use devalang_utils::logger::LogLevel;
+
+        for stmt in &module.statements {
+            match &stmt.kind {
+                StatementKind::Let { name } => {
+                    if let Value::Null = stmt.value {
+                        logger.log_message(
+                            LogLevel::Error,
+                            &format!("Variable '{}' is declared but not initialized.", name),
+                        );
+                        module.variable_table.variables.insert(
+                            name.clone(),
+                            Value::StatementKind(Box::new(stmt.kind.clone())),
+                        );
+                        continue;
+                    }
+
+                    if module.variable_table.get(name).is_some() {
+                        logger.log_message(
+                            LogLevel::Error,
+                            &format!("Variable '{}' is already defined in this scope.", name),
+                        );
+                        continue;
+                    }
+
+                    if let Some(module_variable) = module.variable_table.variables.get(name) {
+                        logger.log_message(
+                            LogLevel::Error,
+                            &format!(
+                                "Variable '{}' is already defined globally with value: {:?}",
+                                name, module_variable
+                            ),
+                        );
+                        continue;
+                    }
+
+                    module
+                        .variable_table
+                        .variables
+                        .insert(name.clone(), stmt.value.clone());
+                }
+
+                StatementKind::Load { source, alias } => {
+                    let module_dir = std::path::Path::new(&module.path)
+                        .parent()
+                        .unwrap_or(std::path::Path::new(""));
+                    let resolved_path = normalize_path(module_dir.join(source));
+                    module
+                        .variable_table
+                        .variables
+                        .insert(alias.clone(), Value::Sample(resolved_path));
+                }
+
+                StatementKind::Export { names, source: _ } => {
+                    for name in names {
+                        if let Some(val) = module.variable_table.get(name) {
+                            module.export_table.add_export(name.clone(), val.clone());
+                        }
+                    }
+                }
+
+                StatementKind::Import { names, source } => {
+                    let resolved = resolve_relative_path(&module.path, source);
+                    for name in names {
+                        module
+                            .import_table
+                            .add_import(name.clone(), Value::String(resolved.clone()));
+                    }
+                }
+
+                StatementKind::Group => {
+                    if let Value::Map(map) = &stmt.value {
+                        if let (Some(Value::String(name)), Some(Value::Block(body))) =
+                            (map.get("identifier"), map.get("body"))
+                        {
+                            let mut stored_map = HashMap::new();
+                            stored_map
+                                .insert("identifier".to_string(), Value::String(name.clone()));
+                            stored_map.insert("body".to_string(), Value::Block(body.clone()));
+                            module
+                                .variable_table
+                                .set(name.to_string(), Value::Map(stored_map));
+                        } else {
+                            logger.log_message(
+                                LogLevel::Error,
+                                &format!("Invalid group definition: {:?}", stmt.value),
+                            );
+                        }
+                    }
+                }
+
+                _ => {}
+            }
+        }
+    }
+}

package/rust/core/preprocessor/resolver/bank.rs

@@ -1,49 +1,49 @@
-use crate::core::{
-    parser::statement::{Statement, StatementKind},
-    preprocessor::module::Module,
-    store::global::GlobalStore,
-};
-use devalang_types::Value;
-use devalang_utils::logger::Logger;
-
-pub fn resolve_bank(
-    stmt: &Statement,
-    module: &Module,
-    _path: &str,
-    _global_store: &GlobalStore,
-) -> Statement {
-    let mut new_stmt = stmt.clone();
-    let logger = Logger::new();
-    match &stmt.value {
-        Value::Identifier(ident) => {
-            if let Some(val) = module.variable_table.get(ident) {
-                new_stmt.value = val.clone();
-            } else {
-                let message = format!("Bank identifier '{ident}' not found in variable table");
-                logger.log_error_with_stacktrace(&message, &module.path);
-                new_stmt.kind = StatementKind::Error {
-                    message: message.clone(),
-                };
-                new_stmt.value = Value::Null;
-            }
-        }
-
-        Value::String(_) => {}
-
-        Value::Number(_) => {}
-
-        other => {
-            let message = format!(
-                "Expected a string or identifier for bank, found {:?}",
-                other
-            );
-            logger.log_error_with_stacktrace(&message, &module.path);
-            new_stmt.kind = StatementKind::Error {
-                message: "Expected a string or identifier for bank".to_string(),
-            };
-            new_stmt.value = Value::Null;
-        }
-    }
-
-    new_stmt
-}
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::module::Module,
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+use devalang_utils::logger::Logger;
+
+pub fn resolve_bank(
+    stmt: &Statement,
+    module: &Module,
+    _path: &str,
+    _global_store: &GlobalStore,
+) -> Statement {
+    let mut new_stmt = stmt.clone();
+    let logger = Logger::new();
+    match &stmt.value {
+        Value::Identifier(ident) => {
+            if let Some(val) = module.variable_table.get(ident) {
+                new_stmt.value = val.clone();
+            } else {
+                let message = format!("Bank identifier '{ident}' not found in variable table");
+                logger.log_error_with_stacktrace(&message, &module.path);
+                new_stmt.kind = StatementKind::Error {
+                    message: message.clone(),
+                };
+                new_stmt.value = Value::Null;
+            }
+        }
+
+        Value::String(_) => {}
+
+        Value::Number(_) => {}
+
+        other => {
+            let message = format!(
+                "Expected a string or identifier for bank, found {:?}",
+                other
+            );
+            logger.log_error_with_stacktrace(&message, &module.path);
+            new_stmt.kind = StatementKind::Error {
+                message: "Expected a string or identifier for bank".to_string(),
+            };
+            new_stmt.value = Value::Null;
+        }
+    }
+
+    new_stmt
+}

package/rust/core/preprocessor/resolver/call.rs

@@ -1,124 +1,124 @@
-use crate::core::{
-    parser::statement::{Statement, StatementKind},
-    preprocessor::module::Module,
-    store::global::GlobalStore,
-};
-use devalang_types::Value;
-use devalang_utils::logger::{LogLevel, Logger};
-
-pub fn resolve_call(
-    stmt: &Statement,
-    name: String,
-    args: Vec<Value>,
-    module: &Module,
-    _path: &str,
-    global_store: &mut GlobalStore,
-) -> Statement {
-    let logger = Logger::new();
-
-    match &stmt.kind {
-        StatementKind::Call { .. } => {
-            // Check if it's a function
-            if let Some(func) = global_store.functions.functions.get(&name) {
-                let mut call_map = std::collections::HashMap::new();
-                call_map.insert("name".to_string(), Value::Identifier(name.clone()));
-                call_map.insert(
-                    "parameters".to_string(),
-                    Value::Array(
-                        func.parameters
-                            .iter()
-                            .map(|p| Value::Identifier(p.clone()))
-                            .collect(),
-                    ),
-                );
-                call_map.insert("args".to_string(), Value::Array(args.clone()));
-                call_map.insert("body".to_string(), Value::Block(func.body.clone()));
-
-                return Statement {
-                    kind: StatementKind::Call { name, args },
-                    value: Value::Map(call_map),
-                    ..stmt.clone()
-                };
-            }
-
-            // Otherwise, check if it's a variable (e.g. group)
-            if let Some(Value::Statement(stmt_box)) = global_store.variables.variables.get(&name) {
-                if let StatementKind::Group = stmt_box.kind {
-                    if let Value::Map(map) = &stmt_box.value {
-                        if let Some(Value::Block(body)) = map.get("body") {
-                            let mut resolved_map = std::collections::HashMap::new();
-                            resolved_map
-                                .insert("identifier".to_string(), Value::String(name.clone()));
-                            resolved_map.insert("args".to_string(), Value::Array(args.clone()));
-                            resolved_map.insert("body".to_string(), Value::Block(body.clone()));
-
-                            return Statement {
-                                kind: StatementKind::Call { name, args },
-                                value: Value::Map(resolved_map),
-                                ..stmt.clone()
-                            };
-                        }
-                    }
-                }
-                // Pattern case
-                if let StatementKind::Pattern { .. } = stmt_box.kind {
-                    // pattern value may be a string or a map stored on the statement
-                    let mut resolved_map = std::collections::HashMap::new();
-                    resolved_map.insert("identifier".to_string(), Value::String(name.clone()));
-                    // pattern value
-                    match &stmt_box.value {
-                        Value::String(s) => {
-                            resolved_map.insert("pattern".to_string(), Value::String(s.clone()));
-                        }
-                        Value::Map(m) => {
-                            if let Some(val) = m.get("pattern") {
-                                resolved_map.insert("pattern".to_string(), val.clone());
-                            }
-                            if let Some(val) = m.get("target") {
-                                resolved_map.insert("target".to_string(), val.clone());
-                            }
-                        }
-                        _ => {}
-                    }
-                    resolved_map.insert("args".to_string(), Value::Array(args.clone()));
-
-                    return Statement {
-                        kind: StatementKind::Call { name, args },
-                        value: Value::Map(resolved_map),
-                        ..stmt.clone()
-                    };
-                }
-            }
-
-            // Otherwise, log an error
-            logger.log_message(
-                LogLevel::Error,
-                &format!("Function or group '{}' not found", name),
-            );
-            Statement {
-                kind: StatementKind::Error {
-                    message: format!("Function or group '{}' not found", name),
-                },
-                value: Value::Null,
-                ..stmt.clone()
-            }
-        }
-        _ => {
-            let stacktrace = format!("{}:{}:{}", module.path, stmt.line, stmt.column);
-            logger.log_message(
-                LogLevel::Error,
-                &format!("Expected StatementKind::Call in resolve_call()\n  → at {stacktrace}"),
-            );
-
-            Statement {
-                kind: StatementKind::Error {
-                    message: "Expected StatementKind::Call in resolve_call()".to_string(),
-                },
-                value: Value::Null,
-                ..stmt.clone()
-            }
-        }
-    }
-}
-
-// (removed unused helpers get_group_body, error_stmt)
+use crate::core::{
+    parser::statement::{Statement, StatementKind},
+    preprocessor::module::Module,
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+use devalang_utils::logger::{LogLevel, Logger};
+
+pub fn resolve_call(
+    stmt: &Statement,
+    name: String,
+    args: Vec<Value>,
+    module: &Module,
+    _path: &str,
+    global_store: &mut GlobalStore,
+) -> Statement {
+    let logger = Logger::new();
+
+    match &stmt.kind {
+        StatementKind::Call { .. } => {
+            // Check if it's a function
+            if let Some(func) = global_store.functions.functions.get(&name) {
+                let mut call_map = std::collections::HashMap::new();
+                call_map.insert("name".to_string(), Value::Identifier(name.clone()));
+                call_map.insert(
+                    "parameters".to_string(),
+                    Value::Array(
+                        func.parameters
+                            .iter()
+                            .map(|p| Value::Identifier(p.clone()))
+                            .collect(),
+                    ),
+                );
+                call_map.insert("args".to_string(), Value::Array(args.clone()));
+                call_map.insert("body".to_string(), Value::Block(func.body.clone()));
+
+                return Statement {
+                    kind: StatementKind::Call { name, args },
+                    value: Value::Map(call_map),
+                    ..stmt.clone()
+                };
+            }
+
+            // Otherwise, check if it's a variable (e.g. group)
+            if let Some(Value::Statement(stmt_box)) = global_store.variables.variables.get(&name) {
+                if let StatementKind::Group = stmt_box.kind {
+                    if let Value::Map(map) = &stmt_box.value {
+                        if let Some(Value::Block(body)) = map.get("body") {
+                            let mut resolved_map = std::collections::HashMap::new();
+                            resolved_map
+                                .insert("identifier".to_string(), Value::String(name.clone()));
+                            resolved_map.insert("args".to_string(), Value::Array(args.clone()));
+                            resolved_map.insert("body".to_string(), Value::Block(body.clone()));
+
+                            return Statement {
+                                kind: StatementKind::Call { name, args },
+                                value: Value::Map(resolved_map),
+                                ..stmt.clone()
+                            };
+                        }
+                    }
+                }
+                // Pattern case
+                if let StatementKind::Pattern { .. } = stmt_box.kind {
+                    // pattern value may be a string or a map stored on the statement
+                    let mut resolved_map = std::collections::HashMap::new();
+                    resolved_map.insert("identifier".to_string(), Value::String(name.clone()));
+                    // pattern value
+                    match &stmt_box.value {
+                        Value::String(s) => {
+                            resolved_map.insert("pattern".to_string(), Value::String(s.clone()));
+                        }
+                        Value::Map(m) => {
+                            if let Some(val) = m.get("pattern") {
+                                resolved_map.insert("pattern".to_string(), val.clone());
+                            }
+                            if let Some(val) = m.get("target") {
+                                resolved_map.insert("target".to_string(), val.clone());
+                            }
+                        }
+                        _ => {}
+                    }
+                    resolved_map.insert("args".to_string(), Value::Array(args.clone()));
+
+                    return Statement {
+                        kind: StatementKind::Call { name, args },
+                        value: Value::Map(resolved_map),
+                        ..stmt.clone()
+                    };
+                }
+            }
+
+            // Otherwise, log an error
+            logger.log_message(
+                LogLevel::Error,
+                &format!("Function or group '{}' not found", name),
+            );
+            Statement {
+                kind: StatementKind::Error {
+                    message: format!("Function or group '{}' not found", name),
+                },
+                value: Value::Null,
+                ..stmt.clone()
+            }
+        }
+        _ => {
+            let stacktrace = format!("{}:{}:{}", module.path, stmt.line, stmt.column);
+            logger.log_message(
+                LogLevel::Error,
+                &format!("Expected StatementKind::Call in resolve_call()\n  → at {stacktrace}"),
+            );
+
+            Statement {
+                kind: StatementKind::Error {
+                    message: "Expected StatementKind::Call in resolve_call()".to_string(),
+                },
+                value: Value::Null,
+                ..stmt.clone()
+            }
+        }
+    }
+}
+
+// (removed unused helpers get_group_body, error_stmt)