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

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

@@ -0,0 +1,66 @@
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::Parser,
+        statement::{Statement, StatementKind},
+    },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+
+// Syntax:
+// emit <event> [<payload>]
+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 Statement::error(current, "Expected event name after 'emit'".into());
+    };
+    if ev.kind != TokenKind::Identifier {
+        return Statement::error(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

@@ -1,91 +1,100 @@
-use crate::core::{
-    lexer::{ token::TokenKind },
-    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
-    shared::value::Value,
-    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 Statement::error(fn_token, "Expected function name after 'fn'".to_string()),
-    };
-
-    if name_token.kind != TokenKind::Identifier {
-        return Statement::error(
-            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 Statement::error(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 Statement::error(name_token.clone(), "Expected ')' after parameters".to_string());
-    }
-
-    // Expect colon
-    if parser.peek_kind() != Some(TokenKind::Colon) {
-        return Statement::error(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;
-        }
-        body_tokens.push(parser.advance().unwrap().clone());
-    }
-
-    // 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,
-    }
-}
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::Parser,
+        statement::{Statement, StatementKind},
+    },
+    shared::value::Value,
+    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 Statement::error(fn_token, "Expected function name after 'fn'".to_string()),
+    };
+
+    if name_token.kind != TokenKind::Identifier {
+        return Statement::error(
+            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 Statement::error(
+            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 Statement::error(
+            name_token.clone(),
+            "Expected ')' after parameters".to_string(),
+        );
+    }
+
+    // Expect colon
+    if parser.peek_kind() != Some(TokenKind::Colon) {
+        return Statement::error(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;
+        }
+        body_tokens.push(parser.advance().unwrap().clone());
+    }
+
+    // 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,75 +1,85 @@
-use crate::core::{
-    lexer::token::{ Token, TokenKind },
-    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
-    shared::value::Value,
-    store::global::GlobalStore,
-};
-use std::collections::HashMap;
-
-pub fn parse_group_token(
-    parser: &mut Parser,
-    current_token: Token,
-    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());
-    };
-
-    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(
-            identifier_token,
-            "Expected ':' after group identifier".to_string()
-        );
-    };
-
-    if colon_token.kind != TokenKind::Colon {
-        return Statement::error(
-            colon_token.clone(),
-            "Expected ':' after group identifier".to_string()
-        );
-    }
-
-    parser.advance(); // consume ':'
-
-    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;
-        }
-
-        tokens_inside_group.push(token);
-        index += 1;
-    }
-
-    // Advance index once to skip the processed tokens
-    parser.token_index = index;
-
-    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,
-        value: Value::Map(value_map),
-        indent: current_token.indent,
-        line: current_token.line,
-        column: current_token.column,
-    };
-}
+use crate::core::{
+    lexer::token::{Token, TokenKind},
+    parser::{
+        driver::Parser,
+        statement::{Statement, StatementKind},
+    },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+use std::collections::HashMap;
+
+pub fn parse_group_token(
+    parser: &mut Parser,
+    current_token: Token,
+    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(),
+        );
+    };
+
+    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(
+            identifier_token,
+            "Expected ':' after group identifier".to_string(),
+        );
+    };
+
+    if colon_token.kind != TokenKind::Colon {
+        return Statement::error(
+            colon_token.clone(),
+            "Expected ':' after group identifier".to_string(),
+        );
+    }
+
+    parser.advance(); // consume ':'
+
+    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;
+        }
+
+        tokens_inside_group.push(token);
+        index += 1;
+    }
+
+    // Advance index once to skip the processed tokens
+    parser.token_index = index;
+
+    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,
+        value: Value::Map(value_map),
+        indent: current_token.indent,
+        line: current_token.line,
+        column: current_token.column,
+    };
+}