@devaloop/devalang 0.0.1-alpha.9 → 0.0.1-beta.2

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

@@ -0,0 +1,254 @@
+use crate::core::{
+    lexer::token::{Token, TokenKind},
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+use std::collections::HashMap;
+
+pub fn parse_automate_token(
+    parser: &mut Parser,
+    current_token: Token,
+    _global_store: &mut GlobalStore,
+) -> Statement {
+    parser.advance(); // consume 'automate'
+
+    // Expect target identifier
+    let Some(target_token) = parser.peek_clone() else {
+        return crate::core::parser::statement::error_from_token(
+            current_token,
+            "Expected target after 'automate'".to_string(),
+        );
+    };
+
+    if target_token.kind != TokenKind::Identifier && target_token.kind != TokenKind::String {
+        return crate::core::parser::statement::error_from_token(
+            target_token,
+            "Expected valid target after 'automate'".to_string(),
+        );
+    }
+    parser.advance(); // consume target
+
+    // Expect ':'
+    let Some(colon_token) = parser.peek_clone() else {
+        return crate::core::parser::statement::error_from_token(
+            target_token,
+            "Expected ':' after automate target".to_string(),
+        );
+    };
+    if colon_token.kind != TokenKind::Colon {
+        return crate::core::parser::statement::error_from_token(
+            colon_token,
+            "Expected ':' after automate target".to_string(),
+        );
+    }
+    parser.advance(); // consume ':'
+
+    let base_indent = current_token.indent;
+
+    // Collect tokens inside block (indented > base_indent)
+    let mut index = parser.token_index;
+    let mut tokens_inside = Vec::new();
+    while index < parser.tokens.len() {
+        let tok = parser.tokens[index].clone();
+        if tok.indent <= base_indent && tok.kind != TokenKind::Newline {
+            break;
+        }
+        tokens_inside.push(tok);
+        index += 1;
+    }
+    parser.token_index = index;
+
+    // Now parse block manually to capture 'param' entries without reusing general parser kinds
+    let mut local = Parser {
+        resolve_modules: parser.resolve_modules,
+        tokens: tokens_inside,
+        token_index: 0,
+        current_module: parser.current_module.clone(),
+        previous: None,
+    };
+
+    let mut params: HashMap<String, Value> = HashMap::new();
+
+    while let Some(tok) = local.peek_clone() {
+        match tok.kind {
+            TokenKind::Identifier if tok.lexeme == "param" => {
+                local.advance(); // consume 'param'
+                // param name
+                let Some(name_tok) = local.peek_clone() else {
+                    return crate::core::parser::statement::error_from_token(
+                        tok,
+                        "Expected parameter name after 'param'".to_string(),
+                    );
+                };
+                if name_tok.kind != TokenKind::Identifier && name_tok.kind != TokenKind::String {
+                    return crate::core::parser::statement::error_from_token(
+                        name_tok,
+                        "Expected valid parameter name".to_string(),
+                    );
+                }
+                local.advance(); // consume name
+
+                // Expect '{'
+                if !local.match_token(TokenKind::LBrace) {
+                    return crate::core::parser::statement::error_from_token(
+                        name_tok,
+                        "Expected '{' to start parameter block".to_string(),
+                    );
+                }
+
+                // Collect entries like: 0% = 0.0
+                let mut envelope: HashMap<String, Value> = HashMap::new();
+                while let Some(inner) = local.peek_clone() {
+                    if inner.kind == TokenKind::RBrace {
+                        local.advance();
+                        break;
+                    }
+                    // Skip formatting tokens inside the param block
+                    if matches!(
+                        inner.kind,
+                        TokenKind::Newline
+                            | TokenKind::Indent
+                            | TokenKind::Dedent
+                            | TokenKind::Comma
+                    ) {
+                        local.advance();
+                        continue;
+                    }
+
+                    // Read percentage token: could be number followed by '%' as Dot or Identifier? '%' not defined.
+                    // Our lexer has no Percent token, so accept either Number or Identifier containing e.g. '0%'.
+                    let percent_token = inner.clone();
+                    local.advance();
+
+                    let percent_key = percent_token.lexeme.clone();
+
+                    // Expect '='
+                    // Skip any stray formatting between key and '='
+                    while let Some(t) = local.peek_kind() {
+                        if matches!(
+                            t,
+                            TokenKind::Indent | TokenKind::Dedent | TokenKind::Newline
+                        ) {
+                            local.advance();
+                            continue;
+                        }
+                        break;
+                    }
+                    if !local.match_token(TokenKind::Equals) {
+                        return crate::core::parser::statement::error_from_token(
+                            percent_token,
+                            "Expected '=' in param entry".to_string(),
+                        );
+                    }
+
+                    // Read value (number or identifier)
+                    // Skip formatting before value
+                    while let Some(t) = local.peek_kind() {
+                        if matches!(
+                            t,
+                            TokenKind::Indent | TokenKind::Dedent | TokenKind::Newline
+                        ) {
+                            local.advance();
+                            continue;
+                        }
+                        break;
+                    }
+
+                    let value = if let Some(vtok) = local.peek_clone() {
+                        match vtok.kind {
+                            // Handle negative numbers where '-' is lexed as Arrow
+                            TokenKind::Arrow => {
+                                // Check if next token is a number
+                                let mut num_str = String::from("-");
+                                local.advance(); // consume '-'
+                                if let Some(ntok) = local.peek_clone() {
+                                    if ntok.kind == TokenKind::Number {
+                                        num_str.push_str(&ntok.lexeme);
+                                        local.advance(); // consume number
+                                        if let Some(dot) = local.peek_clone() {
+                                            if dot.kind == TokenKind::Dot {
+                                                local.advance();
+                                                if let Some(frac) = local.peek_clone() {
+                                                    if frac.kind == TokenKind::Number {
+                                                        num_str.push('.');
+                                                        num_str.push_str(&frac.lexeme);
+                                                        local.advance();
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        Value::Number(num_str.parse::<f32>().unwrap_or(0.0))
+                                    } else {
+                                        Value::Unknown
+                                    }
+                                } else {
+                                    Value::Unknown
+                                }
+                            }
+                            TokenKind::Number => {
+                                // Possibly a float with dot
+                                let mut number_str = vtok.lexeme.clone();
+                                local.advance();
+                                if let Some(dot) = local.peek_clone() {
+                                    if dot.kind == TokenKind::Dot {
+                                        local.advance();
+                                        if let Some(frac) = local.peek_clone() {
+                                            if frac.kind == TokenKind::Number {
+                                                number_str.push('.');
+                                                number_str.push_str(&frac.lexeme);
+                                                local.advance();
+                                            }
+                                        }
+                                    }
+                                }
+                                Value::Number(number_str.parse::<f32>().unwrap_or(0.0))
+                            }
+                            TokenKind::Identifier => {
+                                local.advance();
+                                Value::Identifier(vtok.lexeme.clone())
+                            }
+                            TokenKind::String => {
+                                local.advance();
+                                Value::String(vtok.lexeme.clone())
+                            }
+                            _ => {
+                                local.advance();
+                                Value::Unknown
+                            }
+                        }
+                    } else {
+                        Value::Null
+                    };
+
+                    envelope.insert(percent_key, value);
+                }
+
+                params.insert(name_tok.lexeme.clone(), Value::Map(envelope));
+            }
+            _ => {
+                local.advance();
+            }
+        }
+    }
+
+    let mut value_map = HashMap::new();
+    value_map.insert(
+        "target".to_string(),
+        Value::String(target_token.lexeme.clone()),
+    );
+    value_map.insert("params".to_string(), Value::Map(params));
+
+    Statement {
+        kind: StatementKind::Automate {
+            target: target_token.lexeme.clone(),
+        },
+        value: Value::Map(value_map),
+        indent: current_token.indent,
+        line: current_token.line,
+        column: current_token.column,
+    }
+}

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

@@ -1,41 +1,91 @@
 use crate::core::{
-    lexer::token::{ Token, TokenKind },
-    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
-    shared::value::Value,
+    lexer::token::{Token, TokenKind},
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
     store::global::GlobalStore,
 };
+use devalang_types::Value;
 
 pub fn parse_call_token(
     parser: &mut Parser,
     current_token: Token,
-    global_store: &mut GlobalStore
+    _global_store: &mut GlobalStore,
 ) -> Statement {
     parser.advance(); // consume "call"
 
-    let value = if let Some(token) = parser.peek_clone() {
-        parser.advance();
-        match token.kind {
-            TokenKind::Identifier => Value::Identifier(token.lexeme.clone()),
-            TokenKind::String => Value::String(token.lexeme.clone()),
-            _ => {
-                return Statement::error(
-                    token,
-                    "Expected identifier or string after 'call'".to_string()
-                );
-            }
+    // Expect function name
+    let name_token = match parser.peek_clone() {
+        Some(t) => t,
+        None => {
+            return crate::core::parser::statement::error_from_token(
+                current_token,
+                "Expected function name after 'call'".to_string(),
+            );
         }
-    } else {
-        return Statement::error(
-            current_token,
-            "Expected identifier or string after 'call'".to_string()
-        );
     };
 
-    return Statement {
-        kind: StatementKind::Call,
-        value,
+    if name_token.kind != TokenKind::Identifier {
+        return crate::core::parser::statement::error_from_token(
+            name_token,
+            "Expected function name to be an identifier".to_string(),
+        );
+    }
+
+    let func_name = name_token.lexeme.clone();
+    parser.advance(); // consume function name
+
+    // Expect '('
+    let mut args: Vec<Value> = Vec::new();
+    if let Some(open_paren) = parser.peek_clone() {
+        if open_paren.kind == TokenKind::LParen {
+            parser.advance(); // consume '('
+
+            // Collect args until ')'
+            while let Some(token) = parser.peek_clone() {
+                if token.kind == TokenKind::RParen {
+                    parser.advance(); // consume ')'
+                    break;
+                }
+
+                match token.kind {
+                    TokenKind::Number => {
+                        if let Ok(num) = token.lexeme.parse::<f32>() {
+                            args.push(Value::Number(num));
+                        }
+                        parser.advance();
+                    }
+                    TokenKind::String => {
+                        args.push(Value::String(token.lexeme.clone()));
+                        parser.advance();
+                    }
+                    TokenKind::Identifier => {
+                        args.push(Value::Identifier(token.lexeme.clone()));
+                        parser.advance();
+                    }
+                    TokenKind::Comma => {
+                        parser.advance(); // skip comma
+                    }
+                    _ => {
+                        return crate::core::parser::statement::error_from_token(
+                            token,
+                            "Unexpected token in call arguments".to_string(),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    Statement {
+        kind: StatementKind::Call {
+            name: func_name,
+            args,
+        },
+        value: Value::Null,
         indent: current_token.indent,
         line: current_token.line,
         column: current_token.column,
-    };
+    }
 }

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

@@ -0,0 +1,70 @@
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+
+pub fn parse_emit_token(
+    parser: &mut Parser,
+    current: crate::core::lexer::token::Token,
+    _global_store: &mut GlobalStore,
+) -> Statement {
+    parser.advance(); // consume 'emit'
+
+    let Some(ev) = parser.peek_clone() else {
+        return crate::core::parser::statement::error_from_token(
+            current,
+            "Expected event name after 'emit'".into(),
+        );
+    };
+    if ev.kind != TokenKind::Identifier {
+        return crate::core::parser::statement::error_from_token(
+            ev.clone(),
+            "Expected identifier as event name".into(),
+        );
+    }
+    let event_name = ev.lexeme.clone();
+    parser.advance(); // consume event name
+
+    // Optional payload on same line: number|string|identifier|map|array
+    let mut payload: Option<Value> = None;
+    if let Some(tok) = parser.peek_clone() {
+        if tok.line == ev.line {
+            let val = match tok.kind {
+                TokenKind::String => {
+                    parser.advance();
+                    Value::String(tok.lexeme.clone())
+                }
+                TokenKind::Number => {
+                    parser.advance();
+                    Value::Number(tok.lexeme.parse().unwrap_or(0.0))
+                }
+                TokenKind::Identifier => {
+                    parser.advance();
+                    Value::Identifier(tok.lexeme.clone())
+                }
+                TokenKind::LBrace => parser.parse_map_value().unwrap_or(Value::Null),
+                TokenKind::LBracket => parser.parse_array_value().unwrap_or(Value::Null),
+                _ => Value::Null,
+            };
+            if val != Value::Null {
+                payload = Some(val);
+            }
+        }
+    }
+
+    Statement {
+        kind: StatementKind::Emit {
+            event: event_name,
+            payload: payload.clone(),
+        },
+        value: payload.unwrap_or(Value::Null),
+        indent: current.indent,
+        line: current.line,
+        column: current.column,
+    }
+}

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

@@ -0,0 +1,113 @@
+use devalang_types::Value;
+
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
+    store::global::GlobalStore,
+};
+
+pub fn parse_function_token(parser: &mut Parser, global_store: &mut GlobalStore) -> Statement {
+    parser.advance(); // consume 'fn'
+
+    let fn_token = match parser.previous_clone() {
+        Some(tok) => tok,
+        None => return Statement::unknown(),
+    };
+
+    let name_token = match parser.peek_clone() {
+        Some(tok) => tok,
+        None => {
+            return crate::core::parser::statement::error_from_token(
+                fn_token,
+                "Expected function name after 'fn'".to_string(),
+            );
+        }
+    };
+
+    if name_token.kind != TokenKind::Identifier {
+        return crate::core::parser::statement::error_from_token(
+            name_token.clone(),
+            "Expected function name to be an identifier".to_string(),
+        );
+    }
+
+    let function_name = name_token.lexeme.clone();
+    parser.advance(); // consume function name
+
+    let mut parameters = Vec::new();
+
+    // Expect '('
+    if parser.peek_kind() != Some(TokenKind::LParen) {
+        return crate::core::parser::statement::error_from_token(
+            name_token.clone(),
+            "Expected '(' after function name".to_string(),
+        );
+    }
+    parser.advance(); // consume '('
+
+    // Parse parameters until ')'
+    let tokens = parser.collect_until(|t| t.kind == TokenKind::RParen || t.kind == TokenKind::EOF);
+    for token in tokens {
+        if token.kind == TokenKind::Identifier {
+            parameters.push(token.lexeme.clone());
+        }
+    }
+
+    if parser.peek_kind() == Some(TokenKind::RParen) {
+        parser.advance(); // consume ')'
+    } else {
+        return crate::core::parser::statement::error_from_token(
+            name_token.clone(),
+            "Expected ')' after parameters".to_string(),
+        );
+    }
+
+    // Expect colon
+    if parser.peek_kind() != Some(TokenKind::Colon) {
+        return crate::core::parser::statement::error_from_token(
+            name_token.clone(),
+            "Expected ':' after ')'".to_string(),
+        );
+    }
+    parser.advance(); // consume ':'
+
+    // Collect ALL tokens indented after this line until Dedent
+    let base_indent = fn_token.indent;
+    let mut body_tokens = Vec::new();
+
+    while let Some(tok) = parser.peek() {
+        if tok.kind == TokenKind::Dedent && tok.indent <= base_indent {
+            break;
+        }
+        if let Some(t) = parser.advance() {
+            body_tokens.push(t.clone());
+        } else {
+            break;
+        }
+    }
+
+    // Parse those tokens into block statements
+    let body = parser.parse_block(body_tokens.clone(), global_store);
+
+    // Skip Dedent if present
+    if let Some(tok) = parser.peek() {
+        if tok.kind == TokenKind::Dedent {
+            parser.advance();
+        }
+    }
+
+    Statement {
+        kind: StatementKind::Function {
+            name: function_name.clone(),
+            parameters: parameters.clone(),
+            body: body.clone(),
+        },
+        value: Value::Null,
+        indent: fn_token.indent,
+        line: fn_token.line,
+        column: fn_token.column,
+    }
+}

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

@@ -1,7 +1,11 @@
+use devalang_types::Value;
+
 use crate::core::{
-    lexer::token::{ Token, TokenKind },
-    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
-    shared::value::Value,
+    lexer::token::{Token, TokenKind},
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
     store::global::GlobalStore,
 };
 use std::collections::HashMap;
@@ -9,31 +13,38 @@ use std::collections::HashMap;
 pub fn parse_group_token(
     parser: &mut Parser,
     current_token: Token,
-    global_store: &mut GlobalStore
+    global_store: &mut GlobalStore,
 ) -> Statement {
     parser.advance(); // consume "group"
 
     let Some(identifier_token) = parser.peek_clone() else {
-        return Statement::error(current_token, "Expected identifier after 'group'".to_string());
+        return crate::core::parser::statement::error_from_token(
+            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());
+    if identifier_token.kind != TokenKind::Identifier && identifier_token.kind != TokenKind::String
+    {
+        return crate::core::parser::statement::error_from_token(
+            identifier_token,
+            "Expected valid identifier".to_string(),
+        );
     }
 
     parser.advance(); // consume identifier
 
     let Some(colon_token) = parser.peek_clone() else {
-        return Statement::error(
+        return crate::core::parser::statement::error_from_token(
             identifier_token,
-            "Expected ':' after group identifier".to_string()
+            "Expected ':' after group identifier".to_string(),
         );
     };
 
     if colon_token.kind != TokenKind::Colon {
-        return Statement::error(
+        return crate::core::parser::statement::error_from_token(
             colon_token.clone(),
-            "Expected ':' after group identifier".to_string()
+            "Expected ':' after group identifier".to_string(),
         );
     }
 
@@ -62,14 +73,17 @@ pub fn parse_group_token(
     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(
+        "identifier".to_string(),
+        Value::String(identifier_token.lexeme.clone()),
+    );
     value_map.insert("body".to_string(), Value::Block(body));
 
-    return Statement {
+    Statement {
         kind: StatementKind::Group,
         value: Value::Map(value_map),
         indent: current_token.indent,
         line: current_token.line,
         column: current_token.column,
-    };
+    }
 }