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

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

@@ -1,20 +1,20 @@
 use std::collections::HashMap;
 
 use crate::core::{
-    lexer::token::{ Token, TokenKind },
+    lexer::token::{Token, TokenKind},
     parser::{
-        driver::Parser,
-        handler::identifier::synth::parse_synth_token,
-        statement::{ Statement, StatementKind },
+        driver::parser::Parser,
+        handler::{dot::parse_dot_token, identifier::synth::parse_synth_token},
+        statement::{Statement, StatementKind},
     },
-    shared::value::Value,
     store::global::GlobalStore,
 };
+use devalang_types::Value;
 
 pub fn parse_let_token(
     parser: &mut Parser,
     current_token: Token,
-    global_store: &mut GlobalStore
+    global_store: &mut GlobalStore,
 ) -> Statement {
     parser.advance(); // consume "let"
 
@@ -23,23 +23,49 @@ pub fn parse_let_token(
             parser.advance();
             token.lexeme.clone()
         } else {
-            return Statement::error(token, "Expected identifier after 'let'".to_string());
+            return crate::core::parser::statement::error_from_token(
+                token,
+                "Expected identifier after 'let'".to_string(),
+            );
         }
     } else {
-        return Statement::error(current_token, "Expected identifier after 'let'".to_string());
+        return crate::core::parser::statement::error_from_token(
+            current_token,
+            "Expected identifier after 'let'".to_string(),
+        );
     };
 
     if !parser.match_token(TokenKind::Equals) {
-        return Statement::error(current_token, "Expected '=' after identifier".to_string());
+        return crate::core::parser::statement::error_from_token(
+            current_token,
+            "Expected '=' after identifier".to_string(),
+        );
     }
 
-    if let Some(token) = parser.peek_clone() {
-        if token.kind == TokenKind::Synth {
-            let synth_stmt = parse_synth_token(parser, token.clone(), global_store);
-
+    // 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: synth_stmt.value,
+                value: Value::String(text.trim().to_string()),
                 indent: current_token.indent,
                 line: current_token.line,
                 column: current_token.column,
@@ -48,6 +74,14 @@ pub fn parse_let_token(
     }
 
     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())
@@ -65,7 +99,8 @@ pub fn parse_let_token(
             Value::Boolean(token.lexeme.parse().unwrap_or(false))
         }
         Some(token) if token.kind == TokenKind::LBrace => {
-            parser.advance(); // consume '{'
+            parser.advance();
+
             let mut map = HashMap::new();
 
             while let Some(key_token) = parser.peek_clone() {
@@ -75,14 +110,17 @@ pub fn parse_let_token(
                 }
 
                 if key_token.kind != TokenKind::Identifier {
-                    return Statement::error(token, "Expected key identifier in map".to_string());
+                    return crate::core::parser::statement::error_from_token(
+                        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);
+                    return crate::core::parser::statement::error_from_token(token, message);
                 }
 
                 let val = match parser.peek_clone() {
@@ -103,7 +141,7 @@ pub fn parse_let_token(
 
                 if val == Value::Null {
                     let message = format!("Invalid value for key '{}'", key);
-                    return Statement::error(token, message);
+                    return crate::core::parser::statement::error_from_token(token, message);
                 }
 
                 map.insert(key, val);
@@ -117,9 +155,11 @@ pub fn parse_let_token(
 
             Value::Map(map)
         }
-        other => {
-            let message = format!("Unexpected value token in let: {:?}", other);
-            return Statement::error(current_token, message);
+        _ => {
+            return crate::core::parser::statement::error_from_token(
+                current_token,
+                "Unhandled value type after '='".to_string(),
+            );
         }
     };
 

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

@@ -1,22 +1,23 @@
-pub mod let_;
-pub mod group;
+pub mod automate;
 pub mod call;
-pub mod spawn;
+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::{
-                call::parse_call_token,
-                group::parse_group_token,
-                let_::parse_let_token,
-                sleep::parse_sleep_token,
-                spawn::parse_spawn_token,
-                synth::parse_synth_token
-            },
+        driver::parser::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,
     },
@@ -31,21 +32,24 @@ pub fn parse_identifier_token(parser: &mut Parser, global_store: &mut GlobalStor
     let current_token_clone = current_token.clone();
     let current_token_lexeme = current_token_clone.lexeme.clone();
 
-    let statement = match current_token_lexeme.as_str() {
+    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
 
-            println!("Unrecognized identifier: {}", current_token_lexeme);
-
-            return Statement::error(current_token_clone, "Unexpected identifier".to_string());
+            crate::core::parser::statement::error_from_token(
+                current_token_clone,
+                "Unexpected identifier".to_string(),
+            )
         }
-    };
-
-    return statement;
+    }
 }

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

@@ -0,0 +1,107 @@
+use devalang_types::Value;
+
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
+    store::global::GlobalStore,
+};
+
+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 crate::core::parser::statement::error_from_token(
+                other,
+                "Expected event name after 'on'".to_string(),
+            );
+        }
+        None => {
+            return crate::core::parser::statement::error_from_token(
+                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 crate::core::parser::statement::error_from_token(
+            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

@@ -0,0 +1,49 @@
+use crate::core::{
+    lexer::token::{Token, TokenKind},
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+
+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 => Value::Identifier(collected[0].lexeme.clone()),
+            TokenKind::String => Value::String(collected[0].lexeme.clone()),
+            TokenKind::Number => {
+                let n = collected[0].lexeme.parse::<f32>().unwrap_or(0.0);
+                Value::Number(n)
+            }
+            _ => 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(" ");
+        Value::String(text.trim().to_string())
+    };
+
+    Statement {
+        kind: StatementKind::Print,
+        value,
+        indent: current_token.indent,
+        line: current_token.line,
+        column: current_token.column,
+    }
+}

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

@@ -1,33 +1,96 @@
+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,
 };
 
 pub fn parse_sleep_token(
     parser: &mut Parser,
     current_token: Token,
-    global_store: &mut GlobalStore
+    _global_store: &mut GlobalStore,
 ) -> Statement {
     parser.advance(); // consume "sleep"
 
-    let duration = if let Some(token) = parser.peek_clone() {
-        if token.kind == TokenKind::Number {
-            parser.advance();
-            token.lexeme.parse().unwrap_or(0.0)
-        } else {
-            return Statement::error(token, "Expected number after 'sleep'".to_string());
+    // Accept number, decimal, fraction like 1/4 (-> Duration::Beat), string, or identifier
+    let duration_value = if let Some(token) = parser.peek_clone() {
+        match token.kind {
+            TokenKind::Number => {
+                let mut num = token.lexeme.clone();
+                parser.advance();
+                // decimal part
+                if let Some(dot) = parser.peek_clone() {
+                    if dot.kind == TokenKind::Dot {
+                        if let Some(next) = parser.peek_nth(1).cloned() {
+                            if next.kind == TokenKind::Number {
+                                parser.advance(); // consume dot
+                                parser.advance(); // consume next number
+                                num.push('.');
+                                num.push_str(&next.lexeme);
+                            }
+                        }
+                    }
+                }
+
+                // fraction form 1/4 -> Duration::Beat("1/4")
+                if let Some(slash) = parser.peek_clone() {
+                    if slash.kind == TokenKind::Slash {
+                        parser.advance();
+                        if let Some(den) = parser.peek_clone() {
+                            if den.kind == TokenKind::Number || den.kind == TokenKind::Identifier {
+                                let frac = format!("{}/{}", num, den.lexeme);
+                                parser.advance();
+                                Value::Duration(devalang_types::Duration::Beat(frac))
+                            } else {
+                                return crate::core::parser::statement::error_from_token(
+                                    slash,
+                                    "Expected denominator after '/' in sleep".to_string(),
+                                );
+                            }
+                        } else {
+                            return crate::core::parser::statement::error_from_token(
+                                slash,
+                                "Expected denominator after '/' in sleep".to_string(),
+                            );
+                        }
+                    } else {
+                        Value::Number(num.parse().unwrap_or(0.0))
+                    }
+                } else {
+                    Value::Number(num.parse().unwrap_or(0.0))
+                }
+            }
+            TokenKind::String => {
+                parser.advance();
+                Value::String(token.lexeme.clone())
+            }
+            TokenKind::Identifier => {
+                parser.advance();
+                Value::Identifier(token.lexeme.clone())
+            }
+            _ => {
+                return crate::core::parser::statement::error_from_token(
+                    token,
+                    "Expected duration after 'sleep'".to_string(),
+                );
+            }
         }
     } else {
-        return Statement::error(current_token, "Expected number after 'sleep'".to_string());
+        return crate::core::parser::statement::error_from_token(
+            current_token,
+            "Expected duration after 'sleep'".to_string(),
+        );
     };
 
-    return Statement {
+    Statement {
         kind: StatementKind::Sleep,
-        value: Value::Number(duration),
+        value: duration_value,
         indent: current_token.indent,
         line: current_token.line,
         column: current_token.column,
-    };
+    }
 }

package/rust/core/parser/handler/identifier/spawn.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_spawn_token(
     parser: &mut Parser,
     current_token: Token,
-    global_store: &mut GlobalStore
+    _global_store: &mut GlobalStore,
 ) -> Statement {
-        parser.advance(); // consume "spawn"
-
-        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 'spawn'".to_string()
-                    );
-                }
-            }
-        } else {
-            return Statement::error(
+    parser.advance(); // consume "spawn"
+
+    // 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 identifier or string after 'spawn'".to_string()
+                "Expected function name after 'spawn'".to_string(),
             );
-        };
-
-        return Statement {
-            kind: StatementKind::Spawn,
-            value,
-            indent: current_token.indent,
-            line: current_token.line,
-            column: current_token.column,
-        };
-}
+        }
+    };
+
+    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 spawn arguments".to_string(),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    Statement {
+        kind: StatementKind::Spawn {
+            name: func_name,
+            args,
+        },
+        value: Value::Null,
+        indent: current_token.indent,
+        line: current_token.line,
+        column: current_token.column,
+    }
+}