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

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

@@ -1,63 +1,63 @@
-use crate::core::lexer::token::{ Token, TokenKind };
-
-pub fn handle_string_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
-) {
-    let quote_char = ch;
-
-    let start_column = *column;
-    let start_line = *line;
-
-    *column += 1;
-
-    let mut string_content = String::new();
-
-    while let Some(&next_ch) = chars.peek() {
-        if next_ch == quote_char {
-            chars.next();
-            *column += 1;
-            break;
-        } else if next_ch == '\\' {
-            chars.next();
-            *column += 1;
-
-            if let Some(escaped) = chars.next() {
-                match escaped {
-                    'n' => string_content.push('\n'),
-                    't' => string_content.push('\t'),
-                    '\\' => string_content.push('\\'),
-                    '"' => string_content.push('"'),
-                    '\'' => string_content.push('\''),
-                    other => {
-                        string_content.push('\\');
-                        string_content.push(other);
-                    }
-                }
-                *column += 1;
-            }
-        } else {
-            chars.next();
-            if next_ch == '\n' {
-                *line += 1;
-                *column = 1;
-            } else {
-                *column += 1;
-            }
-            string_content.push(next_ch);
-        }
-    }
-
-    tokens.push(Token {
-        kind: TokenKind::String,
-        lexeme: string_content,
-        indent: *current_indent,
-        line: start_line,
-        column: start_column,
-    });
-}
+use crate::core::lexer::token::{Token, TokenKind};
+
+pub fn handle_string_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,
+) {
+    let quote_char = ch;
+
+    let start_column = *column;
+    let start_line = *line;
+
+    *column += 1;
+
+    let mut string_content = String::new();
+
+    while let Some(&next_ch) = chars.peek() {
+        if next_ch == quote_char {
+            chars.next();
+            *column += 1;
+            break;
+        } else if next_ch == '\\' {
+            chars.next();
+            *column += 1;
+
+            if let Some(escaped) = chars.next() {
+                match escaped {
+                    'n' => string_content.push('\n'),
+                    't' => string_content.push('\t'),
+                    '\\' => string_content.push('\\'),
+                    '"' => string_content.push('"'),
+                    '\'' => string_content.push('\''),
+                    other => {
+                        string_content.push('\\');
+                        string_content.push(other);
+                    }
+                }
+                *column += 1;
+            }
+        } else {
+            chars.next();
+            if next_ch == '\n' {
+                *line += 1;
+                *column = 1;
+            } else {
+                *column += 1;
+            }
+            string_content.push(next_ch);
+        }
+    }
+
+    tokens.push(Token {
+        kind: TokenKind::String,
+        lexeme: string_content,
+        indent: *current_indent,
+        line: start_line,
+        column: start_column,
+    });
+}

package/rust/core/lexer/mod.rs

@@ -1,51 +1,54 @@
-pub mod handler;
-pub mod token;
-
-use std::fs;
-use std::path::Path;
-use crate::core::{
-    lexer::{ handler::driver::handle_content_lexing, token::Token },
-    utils::path::normalize_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 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
+            );
+        }
+    }
+}

package/rust/core/lexer/token.rs

@@ -1,94 +1,97 @@
-use serde::{ Deserialize, Serialize };
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct Token {
-    pub kind: TokenKind,
-    pub lexeme: String,
-    pub indent: usize,
-    pub line: usize,
-    pub column: usize,
-}
-
-impl Token {
-    pub fn is_error(&self) -> bool {
-        match &self.kind {
-            TokenKind::Error(_) => {
-                return true;
-            }
-            _ => {
-                return false;
-            }
-        };
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub enum TokenKind {
-    // ───── Keywords ─────
-    At,
-    Tempo,
-    Bank,
-    Loop,
-    Function,
-
-    // ───── Instruments ─────
-    Synth,
-
-    // ───── Literals ─────
-    Identifier,
-    Number,
-    String,
-    Boolean,
-    Arrow,
-
-    // ───── Structures ─────
-    Map,
-    Array,
-
-    // ───── Symbols ─────
-    Colon,
-    Comma,
-    Equals,
-    Dot,
-    Slash,
-    Plus,
-    Asterisk,
-    Minus,
-
-    // ───── Operators ─────
-    DoubleEquals,
-    NotEquals,
-    GreaterEqual,
-    LessEqual,
-    Greater,
-    Less,
-
-    // ───── Brackets ─────
-    LBrace, // {
-    RBrace, // }
-    LBracket, // [
-    RBracket, // ]
-    LParen, // (
-    RParen, // )
-
-    // ───── Quotes ─────
-    Quote, // '
-    DbQuote, // "
-
-    // ───── Formatting ─────
-    Newline,
-    Indent,
-    Dedent,
-    Comment,
-
-    // ───── Conditions ─────
-    If,
-    Else,
-    ElseIf,
-
-    // ───── Special / Internal ─────
-    Whitespace,
-    Unknown,
-    Error(String),
-    EOF,
-}
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct Token {
+    pub kind: TokenKind,
+    pub lexeme: String,
+    pub indent: usize,
+    pub line: usize,
+    pub column: usize,
+}
+
+impl Token {
+    pub fn is_error(&self) -> bool {
+        match &self.kind {
+            TokenKind::Error(_) => {
+                return true;
+            }
+            _ => {
+                return false;
+            }
+        };
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub enum TokenKind {
+    // ───── Keywords ─────
+    At,
+    Tempo,
+    Bank,
+    Loop,
+    Function,
+    As,
+    On,
+    Emit,
+
+    // ───── Instruments ─────
+    Synth,
+
+    // ───── Literals ─────
+    Identifier,
+    Number,
+    String,
+    Boolean,
+    Arrow,
+
+    // ───── Structures ─────
+    Map,
+    Array,
+
+    // ───── Symbols ─────
+    Colon,
+    Comma,
+    Equals,
+    Dot,
+    Slash,
+    Plus,
+    Asterisk,
+    Minus,
+
+    // ───── Operators ─────
+    DoubleEquals,
+    NotEquals,
+    GreaterEqual,
+    LessEqual,
+    Greater,
+    Less,
+
+    // ───── Brackets ─────
+    LBrace,   // {
+    RBrace,   // }
+    LBracket, // [
+    RBracket, // ]
+    LParen,   // (
+    RParen,   // )
+
+    // ───── Quotes ─────
+    Quote,   // '
+    DbQuote, // "
+
+    // ───── Formatting ─────
+    Newline,
+    Indent,
+    Dedent,
+    Comment,
+
+    // ───── Conditions ─────
+    If,
+    Else,
+    ElseIf,
+
+    // ───── Special / Internal ─────
+    Whitespace,
+    Unknown,
+    Error(String),
+    EOF,
+}

package/rust/core/mod.rs

@@ -1,11 +1,11 @@
-pub mod lexer;
-pub mod preprocessor;
-pub mod store;
-pub mod parser;
-pub mod shared;
-pub mod debugger;
-pub mod utils;
-pub mod builder;
-pub mod error;
-pub mod audio;
-pub mod plugin;
+pub mod audio;
+pub mod builder;
+pub mod debugger;
+pub mod error;
+pub mod lexer;
+pub mod parser;
+pub mod plugin;
+pub mod preprocessor;
+pub mod shared;
+pub mod store;
+pub mod utils;