@devaloop/devalang 0.0.1-alpha.7 → 0.0.1-alpha.9

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

@@ -1,237 +1,14 @@
+pub mod driver;
+
 pub mod at;
 pub mod brace;
 pub mod colon;
 pub mod comment;
 pub mod dot;
-pub mod equal;
+pub mod operator;
 pub mod identifier;
 pub mod newline;
 pub mod number;
 pub mod indent;
 pub mod string;
-
-use crate::core::lexer::{
-    handler::{
-        at::handle_at_lexer,
-        brace::{ handle_lbrace_lexer, handle_rbrace_lexer },
-        colon::handle_colon_lexer,
-        comment::handle_comment_lexer,
-        dot::handle_dot_lexer,
-        equal::handle_equal_lexer,
-        identifier::handle_identifier_lexer,
-        indent::handle_indent_lexer,
-        newline::handle_newline_lexer,
-        number::handle_number_lexer,
-        string::handle_string_lexer,
-    },
-    token::{ Token, TokenKind },
-};
-
-fn advance_char<I: Iterator<Item = char>>(
-    chars: &mut std::iter::Peekable<I>,
-    line: &mut usize,
-    column: &mut usize
-) -> Option<char> {
-    let c = chars.next()?;
-    if c == '\n' {
-        // Do not increment column on newline here
-    } else {
-        *column += 1;
-    }
-    Some(c)
-}
-
-pub fn handle_content_lexing(content: String) -> Result<Vec<Token>, String> {
-    let mut tokens = Vec::new();
-
-    let mut line = 1;
-    let mut column = 1;
-
-    let mut indent_stack: Vec<usize> = vec![0];
-    let mut current_indent = 0;
-    let mut at_line_start = true;
-
-    let mut chars = content.chars().peekable();
-
-    while chars.peek().is_some() {
-        if at_line_start {
-            handle_indent_lexer(
-                &mut chars,
-                &mut current_indent,
-                &mut indent_stack,
-                &mut tokens,
-                &mut line,
-                &mut column
-            );
-
-            at_line_start = false;
-        }
-
-        let Some(ch) = advance_char(&mut chars, &mut line, &mut column) else {
-            break;
-        };
-
-        match ch {
-            '\n' => {
-                handle_newline_lexer(
-                    ch,
-                    &mut chars,
-                    &mut tokens,
-                    &mut line,
-                    &mut column,
-                    &mut at_line_start,
-                    &mut current_indent
-                );
-            }
-            ' ' | '\t' => {
-                // Already handled by indent_lexer
-            }
-            '#' => {
-                handle_comment_lexer(
-                    ch,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            ':' => {
-                handle_colon_lexer(
-                    ch,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            '=' => {
-                handle_equal_lexer(
-                    ch,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            '{' => {
-                handle_lbrace_lexer(
-                    ch,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            '}' => {
-                handle_rbrace_lexer(
-                    ch,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            '.' => {
-                handle_dot_lexer(
-                    ch,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            '@' => {
-                handle_at_lexer(
-                    ch,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            '\"' | '\'' => {
-                handle_string_lexer(
-                    ch,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            c if c.is_ascii_digit() => {
-                handle_number_lexer(
-                    c,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            c if c.is_ascii_alphabetic() => {
-                handle_identifier_lexer(
-                    c,
-                    &mut chars,
-                    &mut current_indent,
-                    &mut indent_stack,
-                    &mut tokens,
-                    &mut line,
-                    &mut column
-                );
-            }
-            _ => {
-                // Ignore unknown char
-            }
-        }
-    }
-
-    while indent_stack.len() > 1 {
-        indent_stack.pop();
-        current_indent = *indent_stack.last().unwrap();
-        tokens.push(Token {
-            kind: TokenKind::Dedent,
-            lexeme: String::new(),
-            line,
-            column,
-            indent: current_indent,
-        });
-    }
-
-    tokens.push(Token {
-        kind: TokenKind::EOF,
-        lexeme: String::new(),
-        line: line + 1,
-        column: 0,
-        indent: 0,
-    });
-
-    // NOTE: Debug only
-    // for token in &tokens {
-    //     println!(
-    //         "{:?} @ line {}, col {}, indent {}",
-    //         token.kind,
-    //         token.line,
-    //         token.column,
-    //         token.indent
-    //     );
-    // }
-
-    Ok(tokens)
-}
+pub mod arrow;

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

@@ -0,0 +1,44 @@
+use crate::core::lexer::token::{ Token, TokenKind };
+
+pub fn handle_operator_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 next = chars.peek().copied();
+
+    let (kind, len) = match (ch, next) {
+        ('=', Some('=')) => (TokenKind::DoubleEquals, 2),
+        ('!', Some('=')) => (TokenKind::NotEquals, 2),
+        ('>', Some('=')) => (TokenKind::GreaterEqual, 2),
+        ('<', Some('=')) => (TokenKind::LessEqual, 2),
+        ('=', _) => (TokenKind::Equals, 1),
+        ('>', _) => (TokenKind::Greater, 1),
+        ('<', _) => (TokenKind::Less, 1),
+        _ => {
+            return;
+        }
+    };
+
+    if len == 2 {
+        chars.next(); // consume second char
+    }
+
+    tokens.push(Token {
+        kind,
+        lexeme: if len == 2 {
+            format!("{}{}", ch, next.unwrap())
+        } else {
+            ch.to_string()
+        },
+        line: *line,
+        column: *column,
+        indent: *current_indent,
+    });
+
+    *column += len;
+}

package/rust/core/lexer/mod.rs

@@ -2,8 +2,9 @@ pub mod handler;
 pub mod token;
 
 use std::fs;
+use std::path::{Path, PathBuf};
 use crate::core::{
-    lexer::{ handler::handle_content_lexing, token::Token },
+    lexer::{ handler::driver::handle_content_lexing, token::Token },
     utils::path::normalize_path,
 };
 
@@ -20,11 +21,31 @@ impl Lexer {
 
     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(&path).expect("Failed to read the entrypoint file");
+        let file_content =
+            fs::read_to_string(&resolved_path).expect("Failed to read the entrypoint file");
 
-        let tokens = handle_content_lexing(file_content).expect("Failed to lex the content");
+        handle_content_lexing(file_content).expect("Failed to lex the content")
+    }
 
-        tokens
+    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

@@ -24,31 +24,62 @@ impl Token {
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum TokenKind {
+    // ───── Keywords ─────
     At,
     Tempo,
     Bank,
     Loop,
+
+    // ───── Instruments ─────
+    Synth,
+
+    // ───── Literals ─────
     Identifier,
-    Map,
-    Array,
     Number,
     String,
     Boolean,
+    Arrow,
+
+    // ───── Structures ─────
+    Map,
+    Array,
+
+    // ───── Symbols ─────
     Colon,
     Comma,
     Equals,
-    DoubleEquals,
     Dot,
-    LBrace,
-    RBrace,
-    DbQuote,
-    Quote,
-    LBracket,
-    RBracket,
+
+    // ───── Operators ─────
+    DoubleEquals,
+    NotEquals,
+    GreaterEqual,
+    LessEqual,
+    Greater,
+    Less,
+
+    // ───── Brackets ─────
+    LBrace, // {
+    RBrace, // }
+    LBracket, // [
+    RBracket, // ]
+
+    // ───── Quotes ─────
+    Quote, // '
+    DbQuote, // "
+
+    // ───── Formatting ─────
     Newline,
     Indent,
     Dedent,
     Comment,
+
+    // ───── Conditions ─────
+    If,
+    Else,
+    ElseIf,
+
+    // ───── Special / Internal ─────
     Unknown,
     Error(String),
     EOF,