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

package/rust/core/debugger/lexer.rs

@@ -1,27 +1,27 @@
-use std::{ collections::HashMap, fs::create_dir_all };
-use crate::core::{ debugger::Debugger, lexer::token::Token };
-
-pub fn write_lexer_log_file(
-    output_dir: &str,
-    file_name: &str,
-    modules: HashMap<String, Vec<Token>>
-) {
-    let debugger = Debugger::new();
-    let mut content = String::new();
-
-    let log_directory = format!("{}/logs", output_dir);
-
-    create_dir_all(&log_directory).expect("Failed to create log directory");
-
-    for (path, tokens) in modules {
-        content.push_str(&format!("--- Resolved Tokens for {} ---\n", path));
-
-        for token in tokens {
-            content.push_str(&format!("{:?}\n", token));
-        }
-
-        content.push_str("\n");
-    }
-
-    debugger.write_log_file(&log_directory, file_name, &content);
-}
+use crate::core::{debugger::Debugger, lexer::token::Token};
+use std::{collections::HashMap, fs::create_dir_all};
+
+pub fn write_lexer_log_file(
+    output_dir: &str,
+    file_name: &str,
+    modules: HashMap<String, Vec<Token>>,
+) {
+    let debugger = Debugger::new();
+    let mut content = String::new();
+
+    let log_directory = format!("{}/logs", output_dir);
+
+    create_dir_all(&log_directory).expect("Failed to create log directory");
+
+    for (path, tokens) in modules {
+        content.push_str(&format!("--- Resolved Tokens for {} ---\n", path));
+
+        for token in tokens {
+            content.push_str(&format!("{:?}\n", token));
+        }
+
+        content.push_str("\n");
+    }
+
+    debugger.write_log_file(&log_directory, file_name, &content);
+}

package/rust/core/debugger/mod.rs

@@ -1,23 +1,24 @@
-pub mod preprocessor;
-pub mod lexer;
-pub mod store;
-pub mod module;
-
-use std::io::Write;
-
-pub struct Debugger {}
-
-impl Debugger {
-    pub fn new() -> Self {
-        Debugger {}
-    }
-
-    pub fn write_log_file(&self, path: &str, filename: &str, content: &str) {
-        std::fs::create_dir_all(path).expect("Failed to create directory");
-
-        let file_path = format!("{}/{}", path, filename);
-        let mut file = std::fs::File::create(file_path).expect("Failed to create file");
-
-        file.write_all(content.as_bytes()).expect("Failed to write to file");
-    }
-}
+pub mod lexer;
+pub mod module;
+pub mod preprocessor;
+pub mod store;
+
+use std::io::Write;
+
+pub struct Debugger {}
+
+impl Debugger {
+    pub fn new() -> Self {
+        Debugger {}
+    }
+
+    pub fn write_log_file(&self, path: &str, filename: &str, content: &str) {
+        std::fs::create_dir_all(path).expect("Failed to create directory");
+
+        let file_path = format!("{}/{}", path, filename);
+        let mut file = std::fs::File::create(file_path).expect("Failed to create file");
+
+        file.write_all(content.as_bytes())
+            .expect("Failed to write to file");
+    }
+}

package/rust/core/debugger/module.rs

@@ -1,47 +1,55 @@
-use std::{ fs::create_dir_all };
-use crate::core::{
-    debugger::Debugger,
-    store::{ function::FunctionTable, variable::VariableTable },
-};
-
-pub fn write_module_variable_log_file(
-    output_dir: &str,
-    module_path: &str,
-    variable_table: &VariableTable
-) {
-    let debugger = Debugger::new();
-    let mut content = String::new();
-    let module_name = module_path.split('/').last().unwrap_or("index").replace(".deva", "");
-
-    let log_directory = format!("{}/logs/modules/{}", output_dir, module_name);
-    create_dir_all(&log_directory).expect("Failed to create log directory");
-
-    for (var_name, var_data) in &variable_table.variables {
-        content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
-    }
-
-    content.push_str("\n");
-
-    debugger.write_log_file(&log_directory, "variables.log", &content);
-}
-
-pub fn write_module_function_log_file(
-    output_dir: &str,
-    module_path: &str,
-    function_table: &FunctionTable
-) {
-    let debugger = Debugger::new();
-    let mut content = String::new();
-    let module_name = module_path.split('/').last().unwrap_or("index").replace(".deva", "");
-
-    let log_directory = format!("{}/logs/modules/{}", output_dir, module_name);
-    create_dir_all(&log_directory).expect("Failed to create log directory");
-
-    for (func_name, func_data) in &function_table.functions {
-        content.push_str(&format!("{:?} = {:?}\n", func_name, func_data));
-    }
-
-    content.push_str("\n");
-
-    debugger.write_log_file(&log_directory, "functions.log", &content);
-}
+use crate::core::{
+    debugger::Debugger,
+    store::{function::FunctionTable, variable::VariableTable},
+};
+use std::fs::create_dir_all;
+
+pub fn write_module_variable_log_file(
+    output_dir: &str,
+    module_path: &str,
+    variable_table: &VariableTable,
+) {
+    let debugger = Debugger::new();
+    let mut content = String::new();
+    let module_name = module_path
+        .split('/')
+        .last()
+        .unwrap_or("index")
+        .replace(".deva", "");
+
+    let log_directory = format!("{}/logs/modules/{}", output_dir, module_name);
+    create_dir_all(&log_directory).expect("Failed to create log directory");
+
+    for (var_name, var_data) in &variable_table.variables {
+        content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
+    }
+
+    content.push_str("\n");
+
+    debugger.write_log_file(&log_directory, "variables.log", &content);
+}
+
+pub fn write_module_function_log_file(
+    output_dir: &str,
+    module_path: &str,
+    function_table: &FunctionTable,
+) {
+    let debugger = Debugger::new();
+    let mut content = String::new();
+    let module_name = module_path
+        .split('/')
+        .last()
+        .unwrap_or("index")
+        .replace(".deva", "");
+
+    let log_directory = format!("{}/logs/modules/{}", output_dir, module_name);
+    create_dir_all(&log_directory).expect("Failed to create log directory");
+
+    for (func_name, func_data) in &function_table.functions {
+        content.push_str(&format!("{:?} = {:?}\n", func_name, func_data));
+    }
+
+    content.push_str("\n");
+
+    debugger.write_log_file(&log_directory, "functions.log", &content);
+}

package/rust/core/debugger/preprocessor.rs

@@ -1,27 +1,27 @@
-use std::{ collections::HashMap, fs::create_dir_all };
-use crate::core::{ debugger::Debugger, parser::statement::Statement };
-
-pub fn write_preprocessor_log_file(
-    output_dir: &str,
-    file_name: &str,
-    modules: HashMap<String, Vec<Statement>>
-) {
-    let debugger = Debugger::new();
-    let mut content = String::new();
-
-    let log_directory = format!("{}/logs", output_dir);
-
-    create_dir_all(&log_directory).expect("Failed to create log directory");
-
-    for (path, stmts) in modules {
-        content.push_str(&format!("--- Resolved Statements for {} ---\n", path));
-
-        for stmt in stmts {
-            content.push_str(&format!("{:?}\n", stmt));
-        }
-
-        content.push_str("\n");
-    }
-
-    debugger.write_log_file(&log_directory, file_name, &content);
-}
+use crate::core::{debugger::Debugger, parser::statement::Statement};
+use std::{collections::HashMap, fs::create_dir_all};
+
+pub fn write_preprocessor_log_file(
+    output_dir: &str,
+    file_name: &str,
+    modules: HashMap<String, Vec<Statement>>,
+) {
+    let debugger = Debugger::new();
+    let mut content = String::new();
+
+    let log_directory = format!("{}/logs", output_dir);
+
+    create_dir_all(&log_directory).expect("Failed to create log directory");
+
+    for (path, stmts) in modules {
+        content.push_str(&format!("--- Resolved Statements for {} ---\n", path));
+
+        for stmt in stmts {
+            content.push_str(&format!("{:?}\n", stmt));
+        }
+
+        content.push_str("\n");
+    }
+
+    debugger.write_log_file(&log_directory, file_name, &content);
+}

package/rust/core/debugger/store.rs

@@ -1,39 +1,40 @@
-use std::{ fs::create_dir_all };
-use crate::core::{
-    debugger::Debugger,
-    store::{ function::FunctionTable, variable::VariableTable },
-};
-
-pub fn write_variables_log_file(output_dir: &str, file_name: &str, variables: VariableTable) {
-    let debugger = Debugger::new();
-    let mut content = String::new();
-
-    let log_directory = format!("{}/logs", output_dir);
-    create_dir_all(&log_directory).expect("Failed to create log directory");
-
-    for (var_name, var_data) in variables.variables {
-        content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
-    }
-
-    content.push_str("\n");
-
-    debugger.write_log_file(&log_directory, file_name, &content);
-}
-
-pub fn write_function_log_file(output_dir: &str, file_name: &str, functions: FunctionTable) {
-    let debugger = Debugger::new();
-    let mut content = String::new();
-
-    let log_directory = format!("{}/logs", output_dir);
-    create_dir_all(&log_directory).expect("Failed to create log directory");
-
-    for (_index, function) in functions.functions {
-        content.push_str(
-            &format!("'{}' = [{:?}] => {:?}\n", function.name, function.parameters, function.body)
-        );
-    }
-
-    content.push_str("\n");
-
-    debugger.write_log_file(&log_directory, file_name, &content);
-}
+use crate::core::{
+    debugger::Debugger,
+    store::{function::FunctionTable, variable::VariableTable},
+};
+use std::fs::create_dir_all;
+
+pub fn write_variables_log_file(output_dir: &str, file_name: &str, variables: VariableTable) {
+    let debugger = Debugger::new();
+    let mut content = String::new();
+
+    let log_directory = format!("{}/logs", output_dir);
+    create_dir_all(&log_directory).expect("Failed to create log directory");
+
+    for (var_name, var_data) in variables.variables {
+        content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
+    }
+
+    content.push_str("\n");
+
+    debugger.write_log_file(&log_directory, file_name, &content);
+}
+
+pub fn write_function_log_file(output_dir: &str, file_name: &str, functions: FunctionTable) {
+    let debugger = Debugger::new();
+    let mut content = String::new();
+
+    let log_directory = format!("{}/logs", output_dir);
+    create_dir_all(&log_directory).expect("Failed to create log directory");
+
+    for (_index, function) in functions.functions {
+        content.push_str(&format!(
+            "'{}' = [{:?}] => {:?}\n",
+            function.name, function.parameters, function.body
+        ));
+    }
+
+    content.push_str("\n");
+
+    debugger.write_log_file(&log_directory, file_name, &content);
+}

package/rust/core/error/mod.rs

@@ -1,69 +1,80 @@
-use crate::core::parser::{ statement::{ Statement, StatementKind }, driver::Parser };
-use serde::{Serialize, Deserialize};
-
-pub struct ErrorHandler {
-    errors: Vec<Error>,
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-pub struct ErrorResult {
-    pub message: String,
-    pub line: usize,
-    pub column: usize,
-}
-
-#[derive(Clone)]
-pub struct Error {
-    pub message: String,
-    pub line: usize,
-    pub column: usize,
-}
-
-impl ErrorHandler {
-    pub fn new() -> Self {
-        Self { errors: Vec::new() }
-    }
-
-    pub fn add_error(&mut self, message: String, line: usize, column: usize) {
-        let error_statement = Error {
-            message,
-            line,
-            column,
-        };
-        self.errors.push(error_statement);
-    }
-
-    pub fn has_errors(&self) -> bool {
-        !self.errors.is_empty()
-    }
-
-    pub fn get_errors(&self) -> &Vec<Error> {
-        &self.errors
-    }
-
-    pub fn clear_errors(&mut self) {
-        self.errors.clear();
-    }
-
-    pub fn detect_from_statements(&mut self, _parser: &mut Parser, statements: &[Statement]) {
-        for stmt in statements {
-            match &stmt.kind {
-                StatementKind::Unknown => {
-                    self.add_error(
-                        "Unknown statement".to_string(),
-                        stmt.line,
-                        stmt.column
-                    );
-                }
-                StatementKind::Error { message } => {
-                    self.add_error(
-                        message.clone(),
-                        stmt.line,
-                        stmt.column
-                    );
-                }
-                _ => {}
-            }
-        }
-    }
-}
+use crate::core::parser::{
+    driver::Parser,
+    statement::{Statement, StatementKind},
+};
+use serde::{Deserialize, Serialize};
+
+pub struct ErrorHandler {
+    errors: Vec<Error>,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum Severity {
+    Warning,
+    Critical,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
+pub struct StackFrame {
+    pub module: Option<String>,
+    pub context: Option<String>,
+    pub line: usize,
+    pub column: usize,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct ErrorResult {
+    pub message: String,
+    pub line: usize,
+    pub column: usize,
+    pub severity: Severity,
+    pub stack: Vec<StackFrame>,
+}
+
+#[derive(Clone)]
+pub struct Error {
+    pub message: String,
+    pub line: usize,
+    pub column: usize,
+}
+
+impl ErrorHandler {
+    pub fn new() -> Self {
+        Self { errors: Vec::new() }
+    }
+
+    pub fn add_error(&mut self, message: String, line: usize, column: usize) {
+        let error_statement = Error {
+            message,
+            line,
+            column,
+        };
+        self.errors.push(error_statement);
+    }
+
+    pub fn has_errors(&self) -> bool {
+        !self.errors.is_empty()
+    }
+
+    pub fn get_errors(&self) -> &Vec<Error> {
+        &self.errors
+    }
+
+    pub fn clear_errors(&mut self) {
+        self.errors.clear();
+    }
+
+    pub fn detect_from_statements(&mut self, _parser: &mut Parser, statements: &[Statement]) {
+        for stmt in statements {
+            match &stmt.kind {
+                StatementKind::Unknown => {
+                    self.add_error("Unknown statement".to_string(), stmt.line, stmt.column);
+                }
+                StatementKind::Error { message } => {
+                    self.add_error(message.clone(), stmt.line, stmt.column);
+                }
+                _ => {}
+            }
+        }
+    }
+}

package/rust/core/lexer/handler/arrow.rs

@@ -1,82 +1,82 @@
-use crate::core::lexer::token::{ Token, TokenKind };
-
-pub fn handle_arrow_lexer(
-    ch: char,
-    chars: &mut std::iter::Peekable<std::str::Chars>,
-    current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
-    tokens: &mut Vec<Token>,
-    line: &mut usize,
-    column: &mut usize
-) {
-    // If next char is '>', this is an arrow '->'.
-    if let Some(&c) = chars.peek() {
-        if c == '>' {
-            let mut arrow_call = ch.to_string();
-            chars.next();
-            arrow_call.push(c);
-            *column += 1;
-
-            tokens.push(Token {
-                kind: TokenKind::Arrow,
-                lexeme: arrow_call,
-                line: *line,
-                column: *column,
-                indent: *current_indent,
-            });
-            return;
-        }
-    }
-
-    // Otherwise, treat '-' as the start of a negative number if followed by digits.
-    let mut lexeme = String::from("-");
-    if let Some(&next) = chars.peek() {
-        if next.is_ascii_digit() {
-            // consume digits
-            while let Some(&d) = chars.peek() {
-                if d.is_ascii_digit() {
-                    chars.next();
-                    lexeme.push(d);
-                    *column += 1;
-                } else {
-                    break;
-                }
-            }
-            // optional decimal part
-            if let Some(&dot) = chars.peek() {
-                if dot == '.' {
-                    chars.next();
-                    lexeme.push(dot);
-                    *column += 1;
-                    while let Some(&d) = chars.peek() {
-                        if d.is_ascii_digit() {
-                            chars.next();
-                            lexeme.push(d);
-                            *column += 1;
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            tokens.push(Token {
-                kind: TokenKind::Number,
-                lexeme,
-                line: *line,
-                column: *column,
-                indent: *current_indent,
-            });
-            return;
-        }
-    }
-
-    // Fallback: lone '-' not part of '->' or a number; emit Unknown to avoid mis-parsing as Arrow
-    tokens.push(Token {
-        kind: TokenKind::Unknown,
-        lexeme: "-".to_string(),
-        line: *line,
-        column: *column,
-        indent: *current_indent,
-    });
-}
+use crate::core::lexer::token::{Token, TokenKind};
+
+pub fn handle_arrow_lexer(
+    ch: char,
+    chars: &mut std::iter::Peekable<std::str::Chars>,
+    current_indent: &mut usize,
+    _indent_stack: &mut Vec<usize>,
+    tokens: &mut Vec<Token>,
+    line: &mut usize,
+    column: &mut usize,
+) {
+    // If next char is '>', this is an arrow '->'.
+    if let Some(&c) = chars.peek() {
+        if c == '>' {
+            let mut arrow_call = ch.to_string();
+            chars.next();
+            arrow_call.push(c);
+            *column += 1;
+
+            tokens.push(Token {
+                kind: TokenKind::Arrow,
+                lexeme: arrow_call,
+                line: *line,
+                column: *column,
+                indent: *current_indent,
+            });
+            return;
+        }
+    }
+
+    // Otherwise, treat '-' as the start of a negative number if followed by digits.
+    let mut lexeme = String::from("-");
+    if let Some(&next) = chars.peek() {
+        if next.is_ascii_digit() {
+            // consume digits
+            while let Some(&d) = chars.peek() {
+                if d.is_ascii_digit() {
+                    chars.next();
+                    lexeme.push(d);
+                    *column += 1;
+                } else {
+                    break;
+                }
+            }
+            // optional decimal part
+            if let Some(&dot) = chars.peek() {
+                if dot == '.' {
+                    chars.next();
+                    lexeme.push(dot);
+                    *column += 1;
+                    while let Some(&d) = chars.peek() {
+                        if d.is_ascii_digit() {
+                            chars.next();
+                            lexeme.push(d);
+                            *column += 1;
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            tokens.push(Token {
+                kind: TokenKind::Number,
+                lexeme,
+                line: *line,
+                column: *column,
+                indent: *current_indent,
+            });
+            return;
+        }
+    }
+
+    // Fallback: lone '-' not part of '->' or a number; emit Unknown to avoid mis-parsing as Arrow
+    tokens.push(Token {
+        kind: TokenKind::Unknown,
+        lexeme: "-".to_string(),
+        line: *line,
+        column: *column,
+        indent: *current_indent,
+    });
+}