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

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

@@ -1,143 +1,158 @@
-use std::collections::HashMap;
-
-use crate::core::{
-    lexer::token::{ Token, TokenKind },
-    parser::{
-        driver::Parser,
-        handler::{ dot::parse_dot_token, identifier::synth::parse_synth_token },
-        statement::{ Statement, StatementKind },
-    },
-    shared::value::Value,
-    store::global::GlobalStore,
-};
-
-pub fn parse_let_token(
-    parser: &mut Parser,
-    current_token: Token,
-    global_store: &mut GlobalStore
-) -> Statement {
-    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());
-    }
-
-    // If RHS begins with '$' or contains expression tokens ('+', '-', '*', '/', '(', '['),
-    // collect the rest of the line as a raw expression string.
-    if let Some(tok) = parser.peek_clone() {
-        let line = tok.line;
-        if tok.lexeme.starts_with('$') || matches!(tok.kind, TokenKind::Identifier | TokenKind::Number | TokenKind::LParen | TokenKind::LBracket) {
-            // Collect tokens until end of the current line
-            let collected = parser.collect_until(|t| t.line != line || matches!(t.kind, TokenKind::Newline | TokenKind::EOF));
-            let mut text = String::new();
-            for t in collected.iter() {
-                if matches!(t.kind, TokenKind::Newline | TokenKind::EOF) { break; }
-                text.push_str(&t.lexeme);
-            }
-            return Statement { kind: StatementKind::Let { name: identifier }, value: Value::String(text.trim().to_string()), indent: current_token.indent, line: current_token.line, column: current_token.column };
-        }
-    }
-
-    let value = match parser.peek_clone() {
-        Some(token) if token.kind == TokenKind::Dot => {
-            let dot_stmt = parse_dot_token(parser, global_store);
-            Value::Statement(Box::new(dot_stmt))
-        }
-        Some(token) if token.kind == TokenKind::Synth => {
-            let synth_stmt = parse_synth_token(parser, token.clone(), global_store);
-            Value::Statement(Box::new(synth_stmt))
-        }
-        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::Boolean => {
-            parser.advance();
-            Value::Boolean(token.lexeme.parse().unwrap_or(false))
-        }
-        Some(token) if token.kind == TokenKind::LBrace => {
-            parser.advance();
-
-            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)
-        }
-        _ => {
-            return Statement::error(current_token, "Unhandled value type after '='".to_string());
-        }
-    };
-
-    Statement {
-        kind: StatementKind::Let { name: identifier },
-        value: value,
-        indent: current_token.indent,
-        line: current_token.line,
-        column: current_token.column,
-    }
-}
+use std::collections::HashMap;
+
+use crate::core::{
+    lexer::token::{Token, TokenKind},
+    parser::{
+        driver::Parser,
+        handler::{dot::parse_dot_token, identifier::synth::parse_synth_token},
+        statement::{Statement, StatementKind},
+    },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+
+pub fn parse_let_token(
+    parser: &mut Parser,
+    current_token: Token,
+    global_store: &mut GlobalStore,
+) -> Statement {
+    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());
+    }
+
+    // If RHS begins with '$' or contains expression tokens ('+', '-', '*', '/', '(', '['),
+    // collect the rest of the line as a raw expression string.
+    if let Some(tok) = parser.peek_clone() {
+        let line = tok.line;
+        if tok.lexeme.starts_with('$')
+            || matches!(
+                tok.kind,
+                TokenKind::Identifier | TokenKind::Number | TokenKind::LParen | TokenKind::LBracket
+            )
+        {
+            // Collect tokens until end of the current line
+            let collected = parser.collect_until(|t| {
+                t.line != line || matches!(t.kind, TokenKind::Newline | TokenKind::EOF)
+            });
+            let mut text = String::new();
+            for t in collected.iter() {
+                if matches!(t.kind, TokenKind::Newline | TokenKind::EOF) {
+                    break;
+                }
+                text.push_str(&t.lexeme);
+            }
+            return Statement {
+                kind: StatementKind::Let { name: identifier },
+                value: Value::String(text.trim().to_string()),
+                indent: current_token.indent,
+                line: current_token.line,
+                column: current_token.column,
+            };
+        }
+    }
+
+    let value = match parser.peek_clone() {
+        Some(token) if token.kind == TokenKind::Dot => {
+            let dot_stmt = parse_dot_token(parser, global_store);
+            Value::Statement(Box::new(dot_stmt))
+        }
+        Some(token) if token.kind == TokenKind::Synth => {
+            let synth_stmt = parse_synth_token(parser, token.clone(), global_store);
+            Value::Statement(Box::new(synth_stmt))
+        }
+        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::Boolean => {
+            parser.advance();
+            Value::Boolean(token.lexeme.parse().unwrap_or(false))
+        }
+        Some(token) if token.kind == TokenKind::LBrace => {
+            parser.advance();
+
+            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)
+        }
+        _ => {
+            return Statement::error(current_token, "Unhandled value type after '='".to_string());
+        }
+    };
+
+    Statement {
+        kind: StatementKind::Let { name: identifier },
+        value: value,
+        indent: current_token.indent,
+        line: current_token.line,
+        column: current_token.column,
+    }
+}

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

@@ -1,56 +1,54 @@
-pub mod let_;
-pub mod group;
-pub mod call;
-pub mod spawn;
-pub mod sleep;
-pub mod synth;
-pub mod function;
-pub mod automate;
-pub mod print;
-
-use crate::core::{
-    parser::{
-        driver::Parser,
-        handler::identifier::{
-            automate::parse_automate_token,
-            call::parse_call_token,
-            group::parse_group_token,
-            let_::parse_let_token,
-            print::parse_print_token,
-            sleep::parse_sleep_token,
-            spawn::parse_spawn_token,
-            synth::parse_synth_token,
-        },
-        statement::{ Statement },
-    },
-    store::global::GlobalStore,
-};
-
-pub fn parse_identifier_token(parser: &mut Parser, global_store: &mut GlobalStore) -> Statement {
-    let Some(current_token) = parser.peek_clone() else {
-        return Statement::unknown();
-    };
-
-    let current_token_clone = current_token.clone();
-    let current_token_lexeme = current_token_clone.lexeme.clone();
-
-    let statement = match current_token_lexeme.as_str() {
-        "let" => parse_let_token(parser, current_token_clone, global_store),
-        "group" => parse_group_token(parser, current_token_clone, global_store),
-        "call" => parse_call_token(parser, current_token_clone, global_store),
-        "spawn" => parse_spawn_token(parser, current_token_clone, global_store),
-        "sleep" => parse_sleep_token(parser, current_token_clone, global_store),
-        "synth" => parse_synth_token(parser, current_token_clone, global_store),
-        "automate" => parse_automate_token(parser, current_token_clone, global_store),
-        "print" => parse_print_token(parser, current_token_clone, global_store),
-        _ => {
-            parser.advance(); // consume identifier
-
-            println!("Unrecognized identifier: {}", current_token_lexeme);
-
-            return Statement::error(current_token_clone, "Unexpected identifier".to_string());
-        }
-    };
-
-    return statement;
-}
+pub mod automate;
+pub mod call;
+pub mod emit;
+pub mod function;
+pub mod group;
+pub mod let_;
+pub mod on;
+pub mod print;
+pub mod sleep;
+pub mod spawn;
+pub mod synth;
+
+use crate::core::{
+    parser::{
+        driver::Parser,
+        handler::identifier::{
+            automate::parse_automate_token, call::parse_call_token, emit::parse_emit_token,
+            group::parse_group_token, let_::parse_let_token, on::parse_on_token,
+            print::parse_print_token, sleep::parse_sleep_token, spawn::parse_spawn_token,
+            synth::parse_synth_token,
+        },
+        statement::Statement,
+    },
+    store::global::GlobalStore,
+};
+
+pub fn parse_identifier_token(parser: &mut Parser, global_store: &mut GlobalStore) -> Statement {
+    let Some(current_token) = parser.peek_clone() else {
+        return Statement::unknown();
+    };
+
+    let current_token_clone = current_token.clone();
+    let current_token_lexeme = current_token_clone.lexeme.clone();
+
+    let statement = match current_token_lexeme.as_str() {
+        "let" => parse_let_token(parser, current_token_clone, global_store),
+        "group" => parse_group_token(parser, current_token_clone, global_store),
+        "call" => parse_call_token(parser, current_token_clone, global_store),
+        "spawn" => parse_spawn_token(parser, current_token_clone, global_store),
+        "sleep" => parse_sleep_token(parser, current_token_clone, global_store),
+        "synth" => parse_synth_token(parser, current_token_clone, global_store),
+        "automate" => parse_automate_token(parser, current_token_clone, global_store),
+        "print" => parse_print_token(parser, current_token_clone, global_store),
+        "on" => parse_on_token(parser, global_store),
+        "emit" => parse_emit_token(parser, current_token_clone, global_store),
+        _ => {
+            parser.advance(); // consume identifier
+
+            return Statement::error(current_token_clone, "Unexpected identifier".to_string());
+        }
+    };
+
+    return statement;
+}

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

@@ -0,0 +1,98 @@
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::Parser,
+        statement::{Statement, StatementKind},
+    },
+    shared::value::Value,
+    store::global::GlobalStore,
+};
+
+// Syntax:
+// on <identifier>:
+//   <indented block>
+pub fn parse_on_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
+    // consume 'on'
+    let on_tok = match parser.peek_clone() {
+        Some(tok) => tok,
+        None => return Statement::unknown(),
+    };
+    parser.advance();
+
+    // Expect event name identifier
+    let event_tok = match parser.peek_clone() {
+        Some(tok) if tok.kind == TokenKind::Identifier => tok,
+        Some(other) => {
+            return Statement::error(other, "Expected event name after 'on'".to_string());
+        }
+        None => return Statement::error(on_tok, "Expected event name after 'on'".to_string()),
+    };
+    let event_name = event_tok.lexeme.clone();
+    parser.advance();
+
+    // Optional parenthesized args on same line
+    let mut args: Option<Vec<Value>> = None;
+    if parser.peek_kind() == Some(TokenKind::LParen) {
+        parser.advance(); // '('
+        let mut collected: Vec<Value> = Vec::new();
+        // Collect tokens until ')', supporting numbers and identifiers separated by comma
+        while let Some(tok) = parser.peek_clone() {
+            match tok.kind {
+                TokenKind::RParen => {
+                    parser.advance();
+                    break;
+                }
+                TokenKind::Number => {
+                    parser.advance();
+                    collected.push(Value::Number(tok.lexeme.parse().unwrap_or(0.0)));
+                }
+                TokenKind::Identifier => {
+                    parser.advance();
+                    collected.push(Value::Identifier(tok.lexeme));
+                }
+                TokenKind::Comma => {
+                    parser.advance();
+                }
+                TokenKind::Whitespace | TokenKind::Newline => {
+                    parser.advance();
+                }
+                _ => {
+                    break;
+                }
+            }
+        }
+        if !collected.is_empty() {
+            args = Some(collected);
+        }
+    }
+
+    // Expect ':' then block
+    if parser.peek_kind() != Some(TokenKind::Colon) {
+        return Statement::error(event_tok, "Expected ':' after event name".to_string());
+    }
+    parser.advance(); // consume ':'
+
+    let base_indent = on_tok.indent;
+    let block_tokens = parser.collect_block_tokens(base_indent);
+    // Parse body within current store context
+    let body = parser.parse_block(block_tokens, _global_store);
+
+    let stmt = Statement {
+        kind: StatementKind::On {
+            event: event_name,
+            args,
+            body,
+        },
+        value: Value::Null,
+        indent: on_tok.indent,
+        line: on_tok.line,
+        column: on_tok.column,
+    };
+
+    // Register in global store for later emission
+    if let StatementKind::On { event, .. } = &stmt.kind {
+        _global_store.register_event_handler(event, stmt.clone());
+    }
+
+    stmt
+}

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

@@ -1,29 +1,52 @@
-use crate::core::{
-    lexer::token::{ Token, TokenKind },
-    parser::{ driver::Parser, statement::{ Statement, StatementKind } },
-    store::global::GlobalStore,
-};
-
-pub fn parse_print_token(
-    parser: &mut Parser,
-    current_token: Token,
-    _global_store: &mut GlobalStore
-) -> Statement {
-    // consume 'print'
-    parser.advance();
-
-    let collected = parser.collect_until(|t| matches!(t.kind, TokenKind::Newline | TokenKind::EOF));
-    // If single identifier, store as Identifier; else store as String of concatenated lexemes
-    let value = if collected.len() == 1 && collected[0].kind == TokenKind::Identifier {
-        crate::core::shared::value::Value::Identifier(collected[0].lexeme.clone())
-    } else {
-        let mut text = String::new();
-        for t in collected.iter() {
-            if matches!(t.kind, TokenKind::Newline | TokenKind::EOF) { break; }
-            text.push_str(&t.lexeme);
-        }
-        crate::core::shared::value::Value::String(text.trim().to_string())
-    };
-
-    Statement { kind: StatementKind::Print, value, 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},
+    },
+    store::global::GlobalStore,
+};
+
+pub fn parse_print_token(
+    parser: &mut Parser,
+    current_token: Token,
+    _global_store: &mut GlobalStore,
+) -> Statement {
+    // consume 'print'
+    parser.advance();
+
+    let collected = parser.collect_until(|t| matches!(t.kind, TokenKind::Newline | TokenKind::EOF));
+    // Accept: print <identifier|string|number|expression>
+    let value = if collected.len() == 1 {
+        match collected[0].kind {
+            TokenKind::Identifier => {
+                crate::core::shared::value::Value::Identifier(collected[0].lexeme.clone())
+            }
+            TokenKind::String => {
+                crate::core::shared::value::Value::String(collected[0].lexeme.clone())
+            }
+            TokenKind::Number => {
+                let n = collected[0].lexeme.parse::<f32>().unwrap_or(0.0);
+                crate::core::shared::value::Value::Number(n)
+            }
+            _ => crate::core::shared::value::Value::String(collected[0].lexeme.clone()),
+        }
+    } else {
+        // Join tokens with spaces to preserve readability for expressions/text
+        let text = collected
+            .iter()
+            .filter(|t| !matches!(t.kind, TokenKind::Newline | TokenKind::EOF))
+            .map(|t| t.lexeme.clone())
+            .collect::<Vec<_>>()
+            .join(" ");
+        crate::core::shared::value::Value::String(text.trim().to_string())
+    };
+
+    Statement {
+        kind: StatementKind::Print,
+        value,
+        indent: current_token.indent,
+        line: current_token.line,
+        column: current_token.column,
+    }
+}