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

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

@@ -1,162 +1,245 @@
-use crate::core::{
-    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 {
-    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)
-        }
-    }
-}
+use crate::core::{
+    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 {
+    parser.advance(); // consume '@'
+
+    let Some(token) = parser.peek_clone() else {
+        return Statement::unknown();
+    };
+
+    let keyword = token.lexeme.as_str();
+
+    match keyword {
+        "use" => {
+            parser.advance(); // consume 'use'
+            let Some(use_token) = parser.previous_clone() else {
+                return Statement::unknown();
+            };
+
+            // Expect plugin author
+            let Some(author_token) = parser.peek_clone() else {
+                return Statement::error(use_token, "Expected plugin author".to_string());
+            };
+            if author_token.kind != TokenKind::Identifier {
+                return Statement::error(
+                    author_token,
+                    "Expected identifier for plugin author".to_string(),
+                );
+            }
+            parser.advance(); // consume author
+
+            // Expect '.'
+            if !parser.match_token(TokenKind::Dot) {
+                return Statement::error(
+                    author_token,
+                    "Expected '.' after plugin author".to_string(),
+                );
+            }
+
+            // Expect plugin name
+            let Some(plugin_token) = parser.peek_clone() else {
+                return Statement::error(author_token, "Expected plugin name".to_string());
+            };
+
+            let name = match plugin_token.kind {
+                TokenKind::Identifier | TokenKind::Number => {
+                    parser.advance();
+                    format!("{}.{}", author_token.lexeme, plugin_token.lexeme)
+                }
+                _ => {
+                    return Statement::error(
+                        plugin_token,
+                        "Expected identifier or number for plugin name".to_string(),
+                    );
+                }
+            };
+
+            // Optional alias
+            let alias = if parser.match_token(TokenKind::As) {
+                let Some(alias_token) = parser.peek_clone() else {
+                    return Statement::error(
+                        use_token,
+                        "Expected identifier after 'as'".to_string(),
+                    );
+                };
+                if alias_token.kind != TokenKind::Identifier {
+                    return Statement::error(
+                        alias_token,
+                        "Expected identifier after 'as'".to_string(),
+                    );
+                }
+                parser.advance();
+                Some(alias_token.lexeme.clone())
+            } else {
+                None
+            };
+
+            Statement {
+                kind: StatementKind::Use {
+                    name: name.clone(),
+                    alias,
+                },
+                value: Value::Null,
+                indent: use_token.indent,
+                line: use_token.line,
+                column: use_token.column,
+            }
+        }
+
+        "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'
+
+            // Example: @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
+
+            if !parser.match_token(TokenKind::As) {
+                return Statement::error(
+                    token,
+                    "Expected 'as' after path in load statement".to_string(),
+                );
+            }
+
+            let Some(alias_token) = parser.peek_clone() else {
+                return Statement::error(
+                    token,
+                    "Expected identifier after 'as' in load statement".to_string(),
+                );
+            };
+
+            if alias_token.kind != TokenKind::Identifier {
+                return Statement::error(
+                    token,
+                    "Expected identifier after 'as' in load statement".to_string(),
+                );
+            }
+
+            let alias = alias_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

@@ -1,69 +1,94 @@
-use crate::core::{
-    lexer::token::TokenKind,
-    parser::{ statement::{ Statement, StatementKind }, driver::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 | TokenKind::Number => {
-                parser.advance(); // consume identifier or number
-
-                let mut value = token.lexeme.clone();
-
-                // Support namespaced banks: <author>.<bank_name>
-                if let Some(next) = parser.peek_clone() {
-                    if next.kind == TokenKind::Dot {
-                        parser.advance(); // consume '.'
-                        if let Some(last) = parser.peek_clone() {
-                            match last.kind {
-                                TokenKind::Identifier | TokenKind::Number => {
-                                    parser.advance();
-                                    value = format!("{}.{}", value, last.lexeme);
-                                    Value::String(value)
-                                }
-                                _ => Value::Unknown,
-                            }
-                        } else {
-                            Value::Unknown
-                        }
-                    } else {
-                        match token.kind {
-                            TokenKind::Identifier => Value::Identifier(value),
-                            TokenKind::Number => Value::Number(value.parse::<f32>().unwrap_or(0.0)),
-                            _ => Value::Unknown,
-                        }
-                    }
-                } else {
-                    match token.kind {
-                        TokenKind::Identifier => Value::Identifier(value),
-                        TokenKind::Number => Value::Number(value.parse::<f32>().unwrap_or(0.0)),
-                        _ => Value::Unknown,
-                    }
-                }
-            }
-            _ => 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,
-    }
-}
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::Parser,
+        statement::{Statement, StatementKind},
+    },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+
+pub fn parse_bank_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
+    // consume 'bank'
+    parser.advance();
+
+    let Some(bank_tok) = parser.previous_clone() else {
+        return Statement::unknown();
+    };
+
+    // Parse bank name
+    let bank_value: Value = match parser.peek_clone() {
+        Some(tok) => match tok.kind {
+            TokenKind::Identifier | TokenKind::Number => {
+                // base name
+                parser.advance();
+                let mut base = tok.lexeme.clone();
+                // optional .suffix (identifier or number)
+                if let Some(dot) = parser.peek_clone() {
+                    if dot.kind == TokenKind::Dot {
+                        // consume '.' and the following ident/number
+                        parser.advance();
+                        if let Some(suffix) = parser.peek_clone() {
+                            match suffix.kind {
+                                TokenKind::Identifier | TokenKind::Number => {
+                                    parser.advance();
+                                    base.push('.');
+                                    base.push_str(&suffix.lexeme);
+                                    Value::String(base)
+                                }
+                                _ => Value::Identifier(base),
+                            }
+                        } else {
+                            Value::Identifier(base)
+                        }
+                    } else {
+                        match tok.kind {
+                            TokenKind::Identifier => Value::String(base),
+                            TokenKind::Number => Value::Number(base.parse::<f32>().unwrap_or(0.0)),
+                            _ => Value::Unknown,
+                        }
+                    }
+                } else {
+                    match tok.kind {
+                        TokenKind::Identifier => Value::String(base),
+                        TokenKind::Number => Value::Number(base.parse::<f32>().unwrap_or(0.0)),
+                        _ => Value::Unknown,
+                    }
+                }
+            }
+            TokenKind::String => {
+                parser.advance();
+                Value::String(tok.lexeme.clone())
+            }
+            _ => Value::Unknown,
+        },
+        None => Value::Unknown,
+    };
+
+    if matches!(bank_value, Value::Unknown | Value::Null) {
+        return Statement::error(bank_tok, "Expected a bank name".to_string());
+    }
+
+    // Optional alias: as <identifier>
+    let mut alias: Option<String> = None;
+    if parser.peek_is("as") {
+        // consume 'as'
+        parser.advance();
+        let Some(next) = parser.peek_clone() else {
+            return Statement::error(bank_tok, "Expected identifier after 'as'".to_string());
+        };
+        if next.kind != TokenKind::Identifier {
+            return Statement::error(next, "Expected identifier after 'as'".to_string());
+        }
+        parser.advance();
+        alias = Some(next.lexeme.clone());
+    }
+
+    Statement {
+        kind: StatementKind::Bank { alias },
+        value: bank_value,
+        indent: bank_tok.indent,
+        line: bank_tok.line,
+        column: bank_tok.column,
+    }
+}