@devaloop/devalang 0.0.1-alpha.16-hotfix.3 → 0.0.1-alpha.18

package/rust/core/error/mod.rs

@@ -2,6 +2,7 @@ use crate::core::parser::{
     driver::Parser,
     statement::{Statement, StatementKind},
 };
+use devalang_types::Value;
 use serde::{Deserialize, Serialize};
 
 pub struct ErrorHandler {
@@ -38,6 +39,12 @@ pub struct Error {
     pub column: usize,
 }
 
+impl Default for ErrorHandler {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl ErrorHandler {
     pub fn new() -> Self {
         Self { errors: Vec::new() }
@@ -78,3 +85,185 @@ impl ErrorHandler {
         }
     }
 }
+
+/// Collects errors recursively from statements (mirrors old utils implementation).
+pub fn collect_errors_recursively(statements: &[Statement]) -> Vec<ErrorResult> {
+    let mut errors: Vec<ErrorResult> = Vec::new();
+
+    for stmt in statements {
+        match &stmt.kind {
+            StatementKind::Unknown => {
+                errors.push(ErrorResult {
+                    message: format!("Unknown statement at line {}:{}", stmt.line, stmt.column),
+                    line: stmt.line,
+                    column: stmt.column,
+                    severity: Severity::Warning,
+                    stack: vec![StackFrame {
+                        module: None,
+                        context: Some("Unknown".to_string()),
+                        line: stmt.line,
+                        column: stmt.column,
+                    }],
+                });
+            }
+            StatementKind::Error { message } => {
+                errors.push(ErrorResult {
+                    message: message.clone(),
+                    line: stmt.line,
+                    column: stmt.column,
+                    severity: Severity::Critical,
+                    stack: vec![StackFrame {
+                        module: None,
+                        context: Some("Error".to_string()),
+                        line: stmt.line,
+                        column: stmt.column,
+                    }],
+                });
+            }
+            StatementKind::Loop => {
+                if let Some(body_statements) = extract_loop_body_statements(&stmt.value) {
+                    let nested = collect_errors_recursively(body_statements);
+                    errors.extend(nested.into_iter().map(|mut e| {
+                        e.stack.insert(
+                            0,
+                            StackFrame {
+                                module: None,
+                                context: Some("loop".to_string()),
+                                line: stmt.line,
+                                column: stmt.column,
+                            },
+                        );
+                        e
+                    }));
+                }
+            }
+            _ => {}
+        }
+    }
+
+    errors
+}
+
+fn extract_loop_body_statements(value: &Value) -> Option<&[Statement]> {
+    if let Value::Map(map) = value {
+        if let Some(Value::Block(statements)) = map.get("body") {
+            return Some(statements);
+        }
+    }
+    None
+}
+
+pub fn partition_errors(errors: Vec<ErrorResult>) -> (Vec<ErrorResult>, Vec<ErrorResult>) {
+    let mut warnings = Vec::new();
+    let mut criticals = Vec::new();
+    for e in errors {
+        match e.severity {
+            Severity::Warning => warnings.push(e),
+            Severity::Critical => criticals.push(e),
+        }
+    }
+    (warnings, criticals)
+}
+
+pub fn log_errors_with_stack(prefix: &str, warnings: &[ErrorResult], criticals: &[ErrorResult]) {
+    use devalang_utils::logger::LogLevel;
+    use devalang_utils::logger::Logger;
+
+    let logger = Logger::new();
+    if !warnings.is_empty() {
+        logger.log_message(
+            LogLevel::Warning,
+            &format!("{}: {} warning(s)", prefix, warnings.len()),
+        );
+        for w in warnings {
+            logger.log_message(LogLevel::Warning, &format!("- {}", w.message));
+            if let Some(frame) = w.stack.first() {
+                let module = frame.module.clone().unwrap_or_default();
+                logger.log_message(
+                    LogLevel::Debug,
+                    &format!(
+                        "     ↳ {}:{}:{} {}",
+                        module,
+                        frame.line,
+                        frame.column,
+                        frame.context.clone().unwrap_or_default()
+                    ),
+                );
+            }
+            if w.stack.len() > 1 {
+                for (i, f) in w.stack.iter().enumerate().skip(1) {
+                    let module = f.module.clone().unwrap_or_default();
+                    logger.log_message(
+                        LogLevel::Debug,
+                        &format!(
+                            "       #{} {}:{}:{} {}",
+                            i,
+                            module,
+                            f.line,
+                            f.column,
+                            f.context.clone().unwrap_or_default()
+                        ),
+                    );
+                }
+            }
+        }
+    }
+    if !criticals.is_empty() {
+        logger.log_message(
+            LogLevel::Error,
+            &format!("{}: {} critical error(s)", prefix, criticals.len()),
+        );
+        for c in criticals {
+            logger.log_message(LogLevel::Error, &format!("- {}", c.message));
+            if let Some(frame) = c.stack.first() {
+                let module = frame.module.clone().unwrap_or_default();
+                logger.log_message(
+                    LogLevel::Error,
+                    &format!(
+                        "     ↳ {}:{}:{} {}",
+                        module,
+                        frame.line,
+                        frame.column,
+                        frame.context.clone().unwrap_or_default()
+                    ),
+                );
+            }
+            if c.stack.len() > 1 {
+                for (i, f) in c.stack.iter().enumerate().skip(1) {
+                    let module = f.module.clone().unwrap_or_default();
+                    logger.log_message(
+                        LogLevel::Error,
+                        &format!(
+                            "       #{} {}:{}:{} {}",
+                            i,
+                            module,
+                            f.line,
+                            f.column,
+                            f.context.clone().unwrap_or_default()
+                        ),
+                    );
+                }
+            }
+        }
+    }
+}
+
+/// Collects errors from all modules and annotates stack frames with module names.
+pub fn collect_all_errors_with_modules(
+    statements_by_module: &std::collections::HashMap<String, Vec<Statement>>,
+) -> Vec<ErrorResult> {
+    let mut all: Vec<ErrorResult> = Vec::new();
+    for (module, stmts) in statements_by_module.iter() {
+        let mut errs = collect_errors_recursively(stmts);
+        for e in errs.iter_mut() {
+            // annotate first stack frame module if missing
+            if let Some(first) = e.stack.first_mut() {
+                if first.module.is_none() {
+                    first.module = Some(module.clone());
+                }
+            }
+        }
+        all.extend(errs.into_iter());
+    }
+    all
+}

package/rust/core/lexer/driver.rs

@@ -0,0 +1,61 @@
+use crate::core::{
+    lexer::{handler::driver::handle_content_lexing, token::Token},
+    utils::path::normalize_path,
+};
+use std::fs;
+use std::path::Path;
+
+pub struct Lexer {}
+
+impl Default for Lexer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Lexer {
+    pub fn new() -> Self {
+        Lexer {}
+    }
+
+    pub fn lex_from_source(&self, source: &str) -> Result<Vec<Token>, String> {
+        handle_content_lexing(source.to_string())
+    }
+
+    pub fn lex_tokens(&self, entrypoint: &str) -> Result<Vec<Token>, String> {
+        let path = normalize_path(entrypoint);
+        let resolved_path = Self::resolve_entry_path(&path)?;
+
+        let file_content = fs::read_to_string(&resolved_path).map_err(|e| {
+            format!(
+                "Failed to read the entrypoint file '{}': {}",
+                resolved_path, e
+            )
+        })?;
+
+        handle_content_lexing(file_content).map_err(|e| format!("Failed to lex the content: {}", e))
+    }
+
+    fn resolve_entry_path(path: &str) -> Result<String, String> {
+        let candidate = Path::new(path);
+
+        if candidate.is_dir() {
+            let index_path = candidate.join("index.deva");
+            if index_path.exists() {
+                Ok(index_path.to_string_lossy().replace("\\", "/"))
+            } else {
+                Err(format!(
+                    "Expected 'index.deva' in directory '{}', but it was not found",
+                    path
+                ))
+            }
+        } else if candidate.is_file() {
+            return Ok(path.to_string());
+        } else {
+            return Err(format!(
+                "Provided entrypoint '{}' is not a valid file or directory",
+                path
+            ));
+        }
+    }
+}

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

@@ -4,7 +4,7 @@ pub fn handle_arrow_lexer(
     ch: char,
     chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_at_lexer(
     ch: char,
     _chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_rbrace_lexer(
     ch: char,
     _chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,
@@ -24,7 +24,7 @@ pub fn handle_lbrace_lexer(
     ch: char,
     _chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_colon_lexer(
     ch: char,
     _chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_comment_lexer(
     _char: char,
     chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_dot_lexer(
     ch: char,
     _chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -23,7 +23,7 @@ fn advance_char<I: Iterator<Item = char>>(
     _line: &mut usize,
     column: &mut usize,
 ) -> Option<char> {
-    while let Some(c) = chars.next() {
+    for c in chars.by_ref() {
         if c == '\r' {
             continue;
         } else if c == '\n' {

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

@@ -1,13 +1,13 @@
-use crate::core::lexer::token::{Token, TokenKind};
+use crate::core::lexer::token::{ Token, TokenKind };
 
 pub fn handle_identifier_lexer(
     ch: char,
     chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
-    column: &mut usize,
+    column: &mut usize
 ) {
     let mut ident = ch.to_string();
 
@@ -25,6 +25,7 @@ pub fn handle_identifier_lexer(
         "if" => TokenKind::If,
         "else" => TokenKind::Else,
         "bank" => TokenKind::Bank,
+        "pattern" => TokenKind::Pattern,
         "bpm" => TokenKind::Tempo,
         "loop" => TokenKind::Loop,
         "for" => TokenKind::Loop,

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

@@ -1,11 +1,10 @@
-pub mod driver;
-
 pub mod arrow;
 pub mod at;
 pub mod brace;
 pub mod colon;
 pub mod comment;
 pub mod dot;
+pub mod driver;
 pub mod identifier;
 pub mod indent;
 pub mod newline;

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

@@ -4,7 +4,7 @@ pub fn handle_number_lexer(
     ch: char,
     chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_operator_lexer(
     ch: char,
     chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_rparen_lexer(
     ch: char,
     _chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,
@@ -24,7 +24,7 @@ pub fn handle_lparen_lexer(
     ch: char,
     _chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_slash_lexer(
     ch: char,
     _chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

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

@@ -4,7 +4,7 @@ pub fn handle_string_lexer(
     ch: char,
     chars: &mut std::iter::Peekable<std::str::Chars>,
     current_indent: &mut usize,
-    _indent_stack: &mut Vec<usize>,
+    _indent_stack: &mut [usize],
     tokens: &mut Vec<Token>,
     line: &mut usize,
     column: &mut usize,

package/rust/core/lexer/mod.rs

@@ -1,54 +1,3 @@
 pub mod handler;
 pub mod token;
-
-use crate::core::{
-    lexer::{handler::driver::handle_content_lexing, token::Token},
-    utils::path::normalize_path,
-};
-use std::fs;
-use std::path::Path;
-
-pub struct Lexer {}
-
-impl Lexer {
-    pub fn new() -> Self {
-        Lexer {}
-    }
-
-    pub fn lex_from_source(&self, source: &str) -> Result<Vec<Token>, String> {
-        handle_content_lexing(source.to_string())
-    }
-
-    pub fn lex_tokens(&self, entrypoint: &str) -> Vec<Token> {
-        let path = normalize_path(entrypoint);
-        let resolved_path = Self::resolve_entry_path(&path);
-
-        let file_content =
-            fs::read_to_string(&resolved_path).expect("Failed to read the entrypoint file");
-
-        handle_content_lexing(file_content).expect("Failed to lex the content")
-    }
-
-    fn resolve_entry_path(path: &str) -> String {
-        let candidate = Path::new(path);
-
-        if candidate.is_dir() {
-            let index_path = candidate.join("index.deva");
-            if index_path.exists() {
-                return index_path.to_string_lossy().replace("\\", "/");
-            } else {
-                panic!(
-                    "Expected 'index.deva' in directory '{}', but it was not found",
-                    path
-                );
-            }
-        } else if candidate.is_file() {
-            return path.to_string();
-        } else {
-            panic!(
-                "Provided entrypoint '{}' is not a valid file or directory",
-                path
-            );
-        }
-    }
-}
+pub mod driver;