@devaloop/devalang 0.0.1-alpha.2 → 0.0.1-alpha.4

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

@@ -0,0 +1,66 @@
+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;
+
+    // Position de départ du token
+    let start_column = *column;
+    let start_line = *line;
+
+    // Consommer le guillemet ouvrant
+    chars.next();
+    *column += 1;
+
+    let mut string_content = String::new();
+
+    while let Some(&next_ch) = chars.peek() {
+        if next_ch == quote_char {
+            chars.next(); // Consomme le guillemet fermant
+            *column += 1;
+            break;
+        } else if next_ch == '\\' {
+            chars.next(); // Consomme '\'
+            *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,14 +1,25 @@
-pub mod indent;
-pub mod identifier;
-pub mod number;
-pub mod at;
-pub mod dot;
-pub mod quote;
-pub mod brace;
-pub mod newline;
-pub mod comment;
-pub mod bracket;
-pub mod colon;
-pub mod equal;
-
-pub mod driver;
+pub mod handler;
+pub mod token;
+
+use std::fs;
+use crate::core::{ lexer::{ handler::handle_content_lexing, token::Token }, utils::path::normalize_path };
+
+pub struct Lexer {}
+
+impl Lexer {
+    pub fn new() -> Self {
+        Lexer {}
+    }
+
+    pub fn lex_tokens(&self, entrypoint: &str) -> Vec<Token> {
+        let path = normalize_path(entrypoint);
+
+        let file_content = fs
+            ::read_to_string(&path)
+            .expect("Failed to read the entrypoint file");
+
+        let tokens = handle_content_lexing(file_content);
+
+        tokens
+    }
+}

package/rust/core/lexer/token.rs

@@ -0,0 +1,55 @@
+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 {
+    At,
+    Tempo,
+    Bank,
+    Loop,
+    Identifier,
+    Map,
+    Array,
+    Number,
+    String,
+    Boolean,
+    Colon,
+    Comma,
+    Equals,
+    DoubleEquals,
+    Dot,
+    LBrace,
+    RBrace,
+    DbQuote,
+    Quote,
+    LBracket,
+    RBracket,
+    Newline,
+    Indent,
+    Dedent,
+    Comment,
+    Unknown,
+    Error(String),
+    EOF,
+}

package/rust/core/mod.rs

@@ -1,6 +1,9 @@
 pub mod lexer;
-pub mod parser;
 pub mod preprocessor;
+pub mod store;
+pub mod parser;
+pub mod shared;
 pub mod debugger;
+pub mod utils;
 pub mod builder;
-pub mod types;
+pub mod error;

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

@@ -0,0 +1,166 @@
+use crate::core::{
+    lexer::token::{ Token, TokenKind },
+    parser::{
+        handler::identifier::parse_identifier_token,
+        statement::{ Statement, StatementKind },
+        Parser,
+    },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+pub fn parse_at_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
+    parser.advance(); // consume '@'
+
+    let Some(token) = parser.peek_clone() else {
+        return Statement::unknown();
+    };
+
+    let keyword = token.lexeme.as_str();
+
+    match keyword {
+        "import" => {
+            parser.advance(); // consume 'import'
+
+            if !parser.match_token(TokenKind::LBrace) {
+                return Statement::error(token, "Expected '{{' after 'import'".to_string());
+            }
+
+            let mut names = Vec::new();
+            while let Some(token) = parser.peek() {
+                match &token.kind {
+                    TokenKind::Identifier => {
+                        names.push(token.lexeme.clone());
+                        parser.advance();
+                    }
+                    TokenKind::Comma => {
+                        parser.advance();
+                    }
+                    TokenKind::RBrace => {
+                        parser.advance();
+                        break;
+                    }
+                    _ => {
+                        let message = format!(
+                            "Unexpected token in import list: {:?}",
+                            token.kind.clone()
+                        );
+                        return Statement::error(token.clone(), message);
+                    }
+                }
+            }
+
+            let Some(from_token) = parser.peek_clone() else {
+                return Statement::error(token, "Expected 'from' after import list".to_string());
+            };
+
+            if from_token.lexeme != "from" {
+                return Statement::error(token, "Expected keyword 'from'".to_string());
+            }
+
+            parser.advance(); // consume 'from'
+
+            let Some(source_token) = parser.peek() else {
+                return Statement::error(token, "Expected string after 'from'".to_string());
+            };
+
+            if source_token.kind != TokenKind::String {
+                return Statement::error(token, "Expected string after 'from'".to_string());
+            }
+
+            let source = source_token.lexeme.clone();
+            parser.advance(); // consume string
+
+            Statement {
+                kind: StatementKind::Import { names, source },
+                value: Value::Null,
+                indent: token.indent,
+                line: token.line,
+                column: token.column,
+            }
+        }
+
+        "export" => {
+            parser.advance(); // consume 'export'
+
+            parser.advance(); // consume '{'
+
+            let names_tokens = parser.collect_until(|t| TokenKind::RBrace == t.kind);
+            let mut names: Vec<String> = Vec::new();
+
+            for token in names_tokens {
+                if token.kind == TokenKind::Identifier {
+                    names.push(token.lexeme.clone());
+                } else if token.kind == TokenKind::Comma {
+                    continue; // Ignore commas
+                } else if token.kind == TokenKind::RBrace {
+                    break; // Stop at the closing brace
+                } else {
+                    return Statement::error(token, "Unexpected token in export list".to_string());
+                }
+            }
+
+            Statement {
+                kind: StatementKind::Export {
+                    names: names.clone(),
+                    source: parser.current_module.clone(),
+                },
+                value: Value::Null,
+                indent: token.indent,
+                line: token.line,
+                column: token.column,
+            }
+        }
+
+        "load" => {
+            parser.advance(); // consume 'load'
+
+            // Exemple : @load "preset.mydeva"
+            let Some(path_token) = parser.peek() else {
+                return Statement::error(token, "Expected string after 'load'".to_string());
+            };
+
+            if path_token.kind != TokenKind::String {
+                return Statement::error(token, "Expected string after 'load'".to_string());
+            }
+
+            let path = path_token.lexeme.clone();
+
+            parser.advance(); // consume string
+            parser.advance(); // consume 'as'
+
+            let Some(as_token) = parser.peek_clone() else {
+                return Statement::error(
+                    token,
+                    "Expected 'as' after path in load statement".to_string()
+                );
+            };
+
+            if as_token.kind != TokenKind::Identifier {
+                return Statement::error(
+                    token,
+                    "Expected identifier after 'as' in load statement".to_string()
+                );
+            }
+
+            let alias = as_token.lexeme.clone();
+
+            parser.advance(); // consume identifier
+
+            Statement {
+                kind: StatementKind::Load {
+                    source: path,
+                    alias,
+                },
+                value: Value::Null,
+                indent: token.indent,
+                line: token.line,
+                column: token.column,
+            }
+        }
+
+        _ => {
+            let message = format!("Unknown keyword after '@' : {}", keyword);
+            Statement::error(token, message)
+        }
+    }
+}

package/rust/core/parser/handler/bank.rs

@@ -0,0 +1,38 @@
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{ statement::{ Statement, StatementKind }, Parser },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+
+pub fn parse_bank_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
+    parser.advance(); // consume 'bank'
+
+    let Some(bank_token) = parser.previous_clone() else {
+        return Statement::unknown();
+    };
+
+    let bank_value = if let Some(token) = parser.peek_clone() {
+        match token.kind {
+            TokenKind::Identifier => {
+                parser.advance();
+                Value::Identifier(token.lexeme.clone())
+            }
+            TokenKind::Number => {
+                parser.advance();
+                Value::Number(token.lexeme.parse::<f32>().unwrap_or(0.0))
+            }
+            _ => Value::Unknown,
+        }
+    } else {
+        return Statement::error(bank_token, "Expected identifier or number after 'bank'".to_string());
+    };
+
+    Statement {
+        kind: StatementKind::Bank,
+        value: bank_value,
+        indent: bank_token.indent,
+        line: bank_token.line,
+        column: bank_token.column,
+    }
+}

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

@@ -0,0 +1,112 @@
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{ statement::{ Statement, StatementKind }, Parser },
+    shared::{ duration::Duration, value::Value },
+    store::global::GlobalStore,
+};
+
+pub fn parse_dot_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
+    parser.advance(); // consume the dot token
+
+    let Some(dot_token) = parser.previous_clone() else {
+        return Statement::unknown();
+    };
+
+    // .kick
+    let Some(entity_token) = parser.peek_clone() else {
+        return Statement {
+            kind: StatementKind::Trigger {
+                entity: String::new(),
+                duration: Duration::Auto,
+            },
+            value: Value::Null,
+            indent: dot_token.indent,
+            line: dot_token.line,
+            column: dot_token.column,
+        };
+    };
+
+    parser.advance(); // consume entity
+    let entity = entity_token.lexeme.clone();
+
+    // Check if there's a duration
+    let next = parser.peek_clone();
+
+    let (duration, value) = match next {
+        // If no more tokens, it's just `.kick`
+        None => (Duration::Auto, Value::Null),
+
+        Some(token) =>
+            match token.kind {
+                TokenKind::Newline | TokenKind::EOF => { (Duration::Auto, Value::Null) }
+
+                TokenKind::Number => {
+                    let duration_lexeme = token.lexeme.clone();
+                    parser.advance(); // consume duration
+
+                    // Try to parse optional value (ex: .kick 250 params)
+                    match parser.peek_clone() {
+                        Some(param_token) if param_token.kind == TokenKind::Identifier => {
+                            parser.advance();
+                            (
+                                parse_duration(duration_lexeme),
+                                Value::Identifier(param_token.lexeme.clone()),
+                            )
+                        }
+
+                        Some(param_token) if param_token.kind == TokenKind::LBrace => {
+                            // Handle value as Map
+                            let map = parser.parse_map_value(); // Assumes you have a helper for map
+                            (parse_duration(duration_lexeme), map.unwrap_or(Value::Null))
+                        }
+
+                        _ => (parse_duration(duration_lexeme), Value::Null),
+                    }
+                }
+
+                TokenKind::Identifier => {
+                    let duration_lexeme = token.lexeme.clone();
+                    parser.advance(); // consume duration
+
+                    // Try to parse optional value (ex: .kick auto params)
+                    match parser.peek_clone() {
+                        Some(param_token) if param_token.kind == TokenKind::Identifier => {
+                            parser.advance();
+                            (
+                                parse_duration(duration_lexeme),
+                                Value::Identifier(param_token.lexeme.clone()),
+                            )
+                        }
+
+                        Some(param_token) if param_token.kind == TokenKind::LBrace => {
+                            // Handle value as Map
+                            let map = parser.parse_map_value(); // Assumes you have a helper for map
+                            (parse_duration(duration_lexeme), map.unwrap_or(Value::Null))
+                        }
+
+                        _ => (parse_duration(duration_lexeme), Value::Null),
+                    }
+                }
+
+                _ => (Duration::Auto, Value::Null),
+            }
+    };
+
+    Statement {
+        kind: StatementKind::Trigger { entity, duration },
+        value,
+        indent: dot_token.indent,
+        line: dot_token.line,
+        column: dot_token.column,
+    }
+}
+
+fn parse_duration(s: String) -> Duration {
+    if s == "auto" {
+        Duration::Auto
+    } else if s.parse::<f32>().is_ok() {
+        Duration::Number(s.parse().unwrap())
+    } else {
+        Duration::Identifier(s)
+    }
+}

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

@@ -0,0 +1,134 @@
+use crate::core::{
+    lexer::token::{ Token, TokenKind },
+    parser::{ statement::{ Statement, StatementKind }, Parser },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+use std::collections::HashMap;
+
+pub fn parse_identifier_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
+    let Some(current_token) = parser.peek_clone() else {
+        return Statement::unknown();
+    };
+
+    if current_token.lexeme == "let" {
+        parser.advance(); // consume "let"
+
+        let identifier = if let Some(token) = parser.peek_clone() {
+            if token.kind == TokenKind::Identifier {
+                parser.advance();
+                token.lexeme.clone()
+            } else {
+                return Statement::error(token, "Expected identifier after 'let'".to_string());
+            }
+        } else {
+            return Statement::error(current_token, "Expected identifier after 'let'".to_string());
+        };
+
+        if !parser.match_token(TokenKind::Equals) {
+            return Statement::error(current_token, "Expected '=' after identifier".to_string());
+        }
+
+        let value = match parser.peek_clone() {
+            Some(token) if token.kind == TokenKind::Identifier => {
+                parser.advance();
+                Value::Identifier(token.lexeme.clone())
+            }
+            Some(token) if token.kind == TokenKind::String => {
+                parser.advance();
+                Value::String(token.lexeme.clone())
+            }
+            Some(token) if token.kind == TokenKind::Number => {
+                parser.advance();
+                Value::Number(token.lexeme.parse().unwrap_or(0.0))
+            }
+            Some(token) if token.kind == TokenKind::LBrace => {
+                parser.advance(); // consume '{'
+                let mut map = HashMap::new();
+
+                while let Some(key_token) = parser.peek_clone() {
+                    if key_token.kind == TokenKind::RBrace {
+                        parser.advance(); // consume '}'
+                        break;
+                    }
+
+                    if key_token.kind != TokenKind::Identifier {
+                        return Statement::error(
+                            token,
+                            "Expected key identifier in map".to_string()
+                        );
+                    }
+                    parser.advance();
+                    let key = key_token.lexeme.clone();
+
+                    if !parser.match_token(TokenKind::Colon) {
+                        let message = format!("Expected ':' after key '{}'", key);
+                        return Statement::error(token, message);
+                    }
+
+                    let val = match parser.peek_clone() {
+                        Some(t) if t.kind == TokenKind::Number => {
+                            parser.advance();
+                            Value::Number(t.lexeme.parse().unwrap_or(0.0))
+                        }
+                        Some(t) if t.kind == TokenKind::String => {
+                            parser.advance();
+                            Value::String(t.lexeme.clone())
+                        }
+                        Some(t) if t.kind == TokenKind::Identifier => {
+                            parser.advance();
+                            Value::Identifier(t.lexeme.clone())
+                        }
+                        _ => { Value::Null }
+                    };
+
+                    if val == Value::Null {
+                        let message = format!("Invalid value for key '{}'", key);
+                        return Statement::error(token, message);
+                    }
+
+                    map.insert(key, val);
+
+                    if let Some(t) = parser.peek() {
+                        if t.kind == TokenKind::Comma {
+                            parser.advance(); // skip comma
+                        }
+                    }
+                }
+
+                Value::Map(map)
+            }
+            other => {
+                let message = format!("Unexpected value token in let: {:?}", other);
+                return Statement::error(current_token, message);
+            }
+        };
+
+        return Statement {
+            kind: StatementKind::Let { name: identifier },
+            value,
+            indent: current_token.indent,
+            line: current_token.line,
+            column: current_token.column,
+        };
+    } else {
+        // Unknown identifier handling
+        Statement {
+            kind: StatementKind::Unknown,
+            value: Value::String(current_token.lexeme.clone()),
+            indent: current_token.indent,
+            line: current_token.line,
+            column: current_token.column,
+        };
+    }
+
+    parser.advance(); // unknown identifier fallback
+
+    Statement {
+        kind: StatementKind::Unknown,
+        value: Value::String(current_token.lexeme.clone()),
+        indent: current_token.indent,
+        line: current_token.line,
+        column: current_token.column,
+    }
+}

package/rust/core/parser/handler/loop_.rs

@@ -0,0 +1,55 @@
+use std::collections::HashMap;
+
+use crate::core::{
+    lexer::{ token::TokenKind },
+    parser::{ statement::{ Statement, StatementKind }, Parser },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+
+pub fn parse_loop_token(parser: &mut Parser, global_store: &mut GlobalStore) -> Statement {
+    parser.advance(); // consume 'loop'
+
+    let Some(loop_token) = parser.previous_clone() else {
+        return Statement::unknown();
+    };
+
+    // Expect an identifier (iterator)
+    let Some(iterator_token) = parser.peek_clone() else {
+        return Statement::error(loop_token, "Expected identifier after 'loop'".to_string());
+    };
+
+    let iterator_name = iterator_token.lexeme.clone();
+    parser.advance(); // consume iterator
+
+    // Expect colon
+    let Some(colon_token) = parser.peek_clone() else {
+        return Statement::error(iterator_token.clone(), "Expected ':' after iterator".to_string());
+    };
+
+    if colon_token.kind != TokenKind::Colon {
+        let message = format!("Expected ':' after iterator, got {:?}", colon_token.kind);
+        return Statement::error(colon_token.clone(), message);
+    }
+
+    parser.advance(); // consume ':'
+
+    // Collect all indented statements
+    let tokens = parser.collect_until(
+        |t| (t.kind == TokenKind::Dedent || t.kind == TokenKind::EOF)
+    );
+    let loop_body = parser.parse_block(tokens.clone(), global_store);
+
+    let mut value_map = HashMap::new();
+
+    value_map.insert("iterator".to_string(), Value::Identifier(iterator_name));
+    value_map.insert("body".to_string(), Value::Block(loop_body.clone()));
+
+    Statement {
+        kind: StatementKind::Loop,
+        value: Value::Map(value_map),
+        indent: loop_token.indent,
+        line: loop_token.line,
+        column: loop_token.column,
+    }
+}

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

@@ -0,0 +1,6 @@
+pub mod at;
+pub mod identifier;
+pub mod dot;
+pub mod tempo;
+pub mod bank;
+pub mod loop_;