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

package/rust/core/parser/driver.rs

@@ -0,0 +1,312 @@
+use crate::core::{
+    lexer::token::{ Token, TokenKind },
+    parser::{
+        handler::{
+            at::parse_at_token,
+            bank::parse_bank_token,
+            condition::parse_condition_token,
+            dot::parse_dot_token,
+            identifier::parse_identifier_token,
+            loop_::parse_loop_token,
+            tempo::parse_tempo_token,
+        },
+        statement::{ Statement, StatementKind },
+    },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct Parser {
+    pub resolve_modules: bool,
+    pub tokens: Vec<Token>,
+    pub token_index: usize,
+    pub current_module: String,
+    pub previous: Option<Token>,
+}
+
+impl Parser {
+    pub fn new() -> Self {
+        Parser {
+            resolve_modules: false,
+            tokens: Vec::new(),
+            token_index: 0,
+            current_module: String::new(),
+            previous: None,
+        }
+    }
+
+    pub fn set_current_module(&mut self, module_path: String) {
+        self.current_module = module_path;
+    }
+
+    pub fn advance(&mut self) -> Option<&Token> {
+        if self.is_eof() {
+            return None;
+        }
+
+        self.previous = self.tokens.get(self.token_index).cloned(); // mémorise avant de bouger
+        self.token_index += 1;
+
+        self.tokens.get(self.token_index - 1)
+    }
+
+    pub fn peek_is(&self, expected: &str) -> bool {
+        self.peek().map_or(false, |t| t.lexeme == expected)
+    }
+
+    pub fn advance_if(&mut self, kind: TokenKind) -> bool {
+        if self.match_token(kind) { true } else { false }
+    }
+
+    pub fn match_token(&mut self, kind: TokenKind) -> bool {
+        if let Some(tok) = self.peek() {
+            if tok.kind == kind {
+                self.advance();
+                return true;
+            }
+        }
+        false
+    }
+
+    pub fn previous_clone(&self) -> Option<Token> {
+        self.previous.clone()
+    }
+
+    pub fn parse_block(
+        &self,
+        tokens: Vec<Token>,
+        global_store: &mut GlobalStore
+    ) -> Vec<Statement> {
+        let mut inner_parser = Parser {
+            resolve_modules: self.resolve_modules,
+            tokens,
+            token_index: 0,
+            current_module: self.current_module.clone(),
+            previous: None,
+        };
+
+        inner_parser.parse_tokens(inner_parser.tokens.clone(), global_store)
+    }
+
+    pub fn parse_tokens(
+        &mut self,
+        tokens: Vec<Token>,
+        global_store: &mut GlobalStore
+    ) -> Vec<Statement> {
+        self.tokens = tokens;
+        self.token_index = 0;
+
+        let mut statements = Vec::new();
+
+        while !self.is_eof() {
+            let token = match self.peek() {
+                Some(t) => t.clone(),
+                None => {
+                    break;
+                }
+            };
+
+            let mut statement = match &token.kind {
+                TokenKind::At => parse_at_token(self, global_store),
+                TokenKind::Identifier => parse_identifier_token(self, global_store),
+                TokenKind::Dot => parse_dot_token(self, global_store),
+                TokenKind::Tempo => parse_tempo_token(self, global_store),
+                TokenKind::Bank => parse_bank_token(self, global_store),
+                TokenKind::Loop => parse_loop_token(self, global_store),
+                TokenKind::If => parse_condition_token(self, global_store),
+
+                | TokenKind::Else // Ignore else, already handled in `parse_condition_token`
+                | TokenKind::Comment
+                | TokenKind::Equals
+                | TokenKind::Colon
+                | TokenKind::Number
+                | TokenKind::String
+                | TokenKind::LBrace
+                | TokenKind::RBrace
+                | TokenKind::Comma
+                | TokenKind::Newline
+                | TokenKind::Dedent
+                | TokenKind::Indent => {
+                    self.advance();
+                    continue;
+                }
+
+                TokenKind::EOF => {
+                    break;
+                }
+
+                _ => {
+                    println!("Unhandled token: {:?}", token);
+                    self.advance();
+                    Statement::unknown()
+                }
+            };
+
+            statements.push(statement);
+        }
+
+        statements
+    }
+
+    pub fn check_token(&self, kind: TokenKind) -> bool {
+        self.peek().map_or(false, |t| t.kind == kind)
+    }
+
+    pub fn parse_map_value(&mut self) -> Option<Value> {
+        if !self.match_token(TokenKind::LBrace) {
+            return None;
+        }
+
+        let mut map = std::collections::HashMap::new();
+
+        while !self.check_token(TokenKind::RBrace) && !self.is_eof() {
+            let key = if let Some(token) = self.advance() {
+                token.lexeme.clone()
+            } else {
+                break;
+            };
+
+            if !self.match_token(TokenKind::Colon) {
+                println!("Expected ':' after map key '{}'", key);
+                break;
+            }
+
+            let value = if let Some(token) = self.peek_clone() {
+                match token.kind {
+                    TokenKind::String => {
+                        self.advance();
+                        Value::String(token.lexeme.clone())
+                    }
+                    TokenKind::Number => {
+                        self.advance();
+                        Value::Number(token.lexeme.parse().unwrap_or(0.0))
+                    }
+                    TokenKind::Identifier => {
+                        self.advance();
+                        Value::Identifier(token.lexeme.clone())
+                    }
+                    _ => {
+                        println!("Unexpected token in map value: {:?}", token);
+                        Value::Null
+                    }
+                }
+            } else {
+                Value::Null
+            };
+
+            map.insert(key, value);
+        }
+
+        if !self.match_token(TokenKind::RBrace) {
+            println!("Expected '}}' at end of map");
+        }
+
+        Some(Value::Map(map))
+    }
+
+    pub fn peek(&self) -> Option<&Token> {
+        self.tokens.get(self.token_index)
+    }
+
+    pub fn peek_clone(&self) -> Option<Token> {
+        self.tokens.get(self.token_index).cloned()
+    }
+
+    pub fn expect(&mut self, kind: TokenKind) -> Result<&Token, String> {
+        let tok = self.advance().ok_or("Unexpected end of input")?;
+        if tok.kind == kind {
+            Ok(tok)
+        } else {
+            Err(format!("Expected {:?}, got {:?}", kind, tok.kind))
+        }
+    }
+
+    pub fn collect_block_tokens(&mut self, base_indent: usize) -> Vec<Token> {
+        let mut tokens = Vec::new();
+
+        while let Some(tok) = self.peek() {
+            if tok.indent <= base_indent && tok.kind != TokenKind::Newline {
+                break;
+            }
+            tokens.push(self.advance().unwrap().clone());
+        }
+
+        tokens
+    }
+
+    pub fn collect_until<F>(&mut self, condition: F) -> Vec<Token> where F: Fn(&Token) -> bool {
+        let mut collected = Vec::new();
+        while let Some(token) = self.peek() {
+            if token.kind == TokenKind::Newline || token.kind == TokenKind::Indent {
+                self.advance(); // Skip newlines and indents
+                continue;
+            }
+            if token.kind == TokenKind::EOF {
+                break;
+            }
+            if condition(token) {
+                break;
+            }
+            collected.push(self.advance().unwrap().clone());
+        }
+        collected
+    }
+
+    pub fn is_eof(&self) -> bool {
+        self.token_index >= self.tokens.len()
+    }
+
+    pub fn parse_block_until_next_else(
+        &mut self,
+        base_indent: usize,
+        global_store: &mut GlobalStore
+    ) -> Vec<Statement> {
+        let mut block_tokens = Vec::new();
+
+        while let Some(tok) = self.peek() {
+            // Stop if we encounter an 'else' at same indent level
+            if tok.lexeme == "else" && tok.indent == base_indent {
+                break;
+            }
+            block_tokens.push(self.advance().unwrap().clone());
+        }
+
+        self.parse_block(block_tokens, global_store)
+    }
+
+    pub fn parse_condition_until_colon(&mut self) -> Option<Value> {
+        let tokens = self.collect_until(|t| t.kind == TokenKind::Colon);
+        if tokens.is_empty() {
+            return None;
+        }
+
+        let condition = tokens
+            .iter()
+            .map(|t| t.lexeme.clone())
+            .collect::<Vec<_>>()
+            .join(" ");
+
+        Some(Value::String(condition))
+    }
+
+    pub fn parse_block_until_else_or_dedent(
+        &mut self,
+        base_indent: usize,
+        global_store: &mut GlobalStore
+    ) -> Vec<Statement> {
+        let mut tokens = Vec::new();
+
+        while let Some(tok) = self.peek() {
+            if tok.lexeme == "else" && tok.indent == base_indent {
+                break;
+            }
+            if tok.indent < base_indent && tok.kind != TokenKind::Newline {
+                break;
+            }
+            tokens.push(self.advance().unwrap().clone());
+        }
+
+        self.parse_block(tokens, global_store)
+    }
+}

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

@@ -1,14 +1,10 @@
 use crate::core::{
-    lexer::token::{ Token, TokenKind },
-    parser::{
-        handler::identifier::parse_identifier_token,
-        statement::{ Statement, StatementKind },
-        Parser,
-    },
+    lexer::token::TokenKind,
+    parser::{ driver::Parser, statement::{ Statement, StatementKind } },
     shared::value::Value,
     store::global::GlobalStore,
 };
-pub fn parse_at_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
+pub fn parse_at_token(parser: &mut Parser, global_store: &mut GlobalStore) -> Statement {
     parser.advance(); // consume '@'
 
     let Some(token) = parser.peek_clone() else {

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

@@ -1,6 +1,6 @@
 use crate::core::{
     lexer::token::TokenKind,
-    parser::{ statement::{ Statement, StatementKind }, Parser },
+    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
     shared::value::Value,
     store::global::GlobalStore,
 };
@@ -25,7 +25,10 @@ pub fn parse_bank_token(parser: &mut Parser, _global_store: &mut GlobalStore) ->
             _ => Value::Unknown,
         }
     } else {
-        return Statement::error(bank_token, "Expected identifier or number after 'bank'".to_string());
+        return Statement::error(
+            bank_token,
+            "Expected identifier or number after 'bank'".to_string()
+        );
     };
 
     Statement {

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

@@ -0,0 +1,74 @@
+use std::collections::HashMap;
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{statement::{Statement, StatementKind}, driver::Parser},
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+
+pub fn parse_condition_token(parser: &mut Parser, global_store: &mut GlobalStore) -> Statement {
+    parser.advance(); // consume 'if'
+    let Some(if_token) = parser.previous_clone() else {
+        return Statement::unknown();
+    };
+
+    let Some(condition) = parser.parse_condition_until_colon() else {
+        return Statement::error(if_token, "Expected condition after 'if'".to_string());
+    };
+
+    parser.advance_if(TokenKind::Colon);
+    let base_indent = if_token.indent;
+
+    let if_body = parser.parse_block_until_else_or_dedent(base_indent, global_store);
+
+    let mut root_map = HashMap::new();
+    root_map.insert("condition".to_string(), condition);
+    root_map.insert("body".to_string(), Value::Block(if_body));
+
+    let mut current = &mut root_map;
+
+    // Loop for else / else if
+    while let Some(tok) = parser.peek_clone() {
+        // Only continue if we see `else` at same indent level
+        if tok.lexeme != "else" || tok.indent != base_indent {
+            break;
+        }
+
+        parser.advance(); // consume 'else'
+
+        // Check if it's an 'else if'
+        let next_condition = if parser.peek_is("if") {
+            parser.advance(); // consume 'if'
+            let Some(cond) = parser.parse_condition_until_colon() else {
+                return Statement::error(tok.clone(), "Expected condition after 'else if'".to_string());
+            };
+            parser.advance_if(TokenKind::Colon);
+            Some(cond)
+        } else {
+            parser.advance_if(TokenKind::Colon);
+            None
+        };
+
+        let body = parser.parse_block_until_else_or_dedent(base_indent, global_store);
+
+        let mut next_map = HashMap::new();
+        if let Some(cond) = next_condition {
+            next_map.insert("condition".to_string(), cond);
+        }
+        next_map.insert("body".to_string(), Value::Block(body));
+
+        current.insert("next".to_string(), Value::Map(next_map));
+        current = match current.get_mut("next") {
+            Some(Value::Map(map)) => map,
+            _ => break,
+        };
+    }
+
+    Statement {
+        kind: StatementKind::If,
+        value: Value::Map(root_map),
+        indent: if_token.indent,
+        line: if_token.line,
+        column: if_token.column,
+    }
+}

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

@@ -1,6 +1,6 @@
 use crate::core::{
     lexer::token::TokenKind,
-    parser::{ statement::{ Statement, StatementKind }, Parser },
+    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
     shared::{ duration::Duration, value::Value },
     store::global::GlobalStore,
 };

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

@@ -1,6 +1,6 @@
 use crate::core::{
     lexer::token::{ Token, TokenKind },
-    parser::{ statement::{ Statement, StatementKind }, Parser },
+    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
     shared::value::Value,
     store::global::GlobalStore,
 };
@@ -114,58 +114,60 @@ pub fn parse_identifier_token(parser: &mut Parser, global_store: &mut GlobalStor
     } else if current_token.lexeme == "group" {
         parser.advance(); // consume "group"
 
-        let identifier = if let Some(token) = parser.peek_clone() {
-            if token.kind == TokenKind::String {
-                parser.advance();
-                token.lexeme.clone()
-            } else if token.kind == TokenKind::Identifier {
-                parser.advance();
-                token.lexeme.clone()
-            } else {
-                return Statement::error(
-                    token,
-                    "Expected string or identifier after 'group'".to_string()
-                );
-            }
-        } else {
-            return Statement::error(current_token, "Expected string after 'group'".to_string());
+        let Some(identifier_token) = parser.peek_clone() else {
+            return Statement::error(current_token, "Expected identifier after 'group'".to_string());
         };
 
+        if
+            identifier_token.kind != TokenKind::Identifier &&
+            identifier_token.kind != TokenKind::String
+        {
+            return Statement::error(identifier_token, "Expected valid identifier".to_string());
+        }
+
+        parser.advance(); // consume identifier
+
         let Some(colon_token) = parser.peek_clone() else {
             return Statement::error(
-                current_token,
+                identifier_token,
                 "Expected ':' after group identifier".to_string()
             );
         };
 
         if colon_token.kind != TokenKind::Colon {
-            let message = format!(
-                "Expected ':' after group identifier, got {:?}",
-                colon_token.kind
+            return Statement::error(
+                colon_token.clone(),
+                "Expected ':' after group identifier".to_string()
             );
-            return Statement::error(colon_token.clone(), message);
         }
 
-        let tokens = parser.collect_until(
-            |t| (t.kind == TokenKind::Dedent || t.kind == TokenKind::EOF)
-        );
-        let group_body = parser.parse_block(tokens.clone(), global_store);
+        parser.advance(); // consume ':'
 
-        // Peek for dedent
-        if let Some(token) = parser.peek() {
-            if token.kind == TokenKind::Dedent {
-                parser.advance();
-            } else {
-                // Unexpected token after group body
+        let base_indent = current_token.indent;
+
+        // Clone without consuming tokens
+        let mut index = parser.token_index;
+        let mut tokens_inside_group = Vec::new();
+
+        while index < parser.tokens.len() {
+            let token = parser.tokens[index].clone();
+
+            if token.indent <= base_indent && token.kind != TokenKind::Newline {
+                break;
             }
-        } else {
-            // EOF or unexpected end of input
+
+            tokens_inside_group.push(token);
+            index += 1;
         }
 
-        let mut value_map = HashMap::new();
+        // Advance index once to skip the processed tokens
+        parser.token_index = index;
 
-        value_map.insert("identifier".to_string(), Value::String(identifier));
-        value_map.insert("body".to_string(), Value::Block(group_body.clone()));
+        let body = parser.parse_block(tokens_inside_group, global_store);
+
+        let mut value_map = HashMap::new();
+        value_map.insert("identifier".to_string(), Value::String(identifier_token.lexeme.clone()));
+        value_map.insert("body".to_string(), Value::Block(body));
 
         return Statement {
             kind: StatementKind::Group,

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

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use crate::core::{
     lexer::{ token::TokenKind },
-    parser::{ statement::{ Statement, StatementKind }, Parser },
+    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
     shared::value::Value,
     store::global::GlobalStore,
 };

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

@@ -3,4 +3,5 @@ pub mod identifier;
 pub mod dot;
 pub mod tempo;
 pub mod bank;
-pub mod loop_;
+pub mod loop_;
+pub mod condition;

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

@@ -1,6 +1,6 @@
 use crate::core::{
     lexer::token::TokenKind,
-    parser::{ statement::{ Statement, StatementKind }, Parser },
+    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
     shared::value::Value,
     store::global::GlobalStore,
 };