@devaloop/devalang 0.0.1-alpha.12 → 0.0.1-alpha.13

package/rust/core/lexer/token.rs

@@ -29,6 +29,7 @@ pub enum TokenKind {
     Tempo,
     Bank,
     Loop,
+    Function,
 
     // ───── Instruments ─────
     Synth,
@@ -64,6 +65,8 @@ pub enum TokenKind {
     RBrace, // }
     LBracket, // [
     RBracket, // ]
+    LParen, // (
+    RParen, // )
 
     // ───── Quotes ─────
     Quote, // '

package/rust/core/parser/driver.rs

@@ -7,7 +7,7 @@ use crate::core::{
             bank::parse_bank_token,
             condition::parse_condition_token,
             dot::parse_dot_token,
-            identifier::parse_identifier_token,
+            identifier::{function::parse_function_token, parse_identifier_token},
             loop_::parse_loop_token,
             tempo::parse_tempo_token,
         },
@@ -138,6 +138,7 @@ impl Parser {
                 TokenKind::Bank => parse_bank_token(self, global_store),
                 TokenKind::Loop => parse_loop_token(self, global_store),
                 TokenKind::If => parse_condition_token(self, global_store),
+                TokenKind::Function => parse_function_token(self, global_store),
 
                 | TokenKind::Else // Ignore else, already handled in `parse_condition_token`
                 | TokenKind::Comment
@@ -303,6 +304,7 @@ impl Parser {
             }
             collected.push(self.advance().unwrap().clone());
         }
+        
         collected
     }
 

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

@@ -1,165 +1,102 @@
 use crate::core::{
     lexer::token::TokenKind,
-    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
-    shared::{ duration::Duration, value::Value },
-    store::global::GlobalStore,
+    parser::{driver::Parser, statement::{Statement, StatementKind}},
+    shared::{duration::Duration, value::Value},
 };
 
-pub fn parse_dot_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
-    parser.advance(); // consume the first dot
+pub fn parse_dot_token(
+    parser: &mut Parser,
+    _global_store: &mut crate::core::store::global::GlobalStore
+) -> Statement {
+    parser.advance(); // consume '.'
 
     let Some(dot_token) = parser.previous_clone() else {
         return Statement::unknown();
     };
 
-    // Parse namespaced identifier: .808.kick.snare
+    // Parse a single entity (namespace-friendly, stops at newline)
     let mut parts = Vec::new();
 
     while let Some(token) = parser.peek_clone() {
         match token.kind {
-            TokenKind::Number => {
-                // Stop if it's part of a duration
-                if let Some(TokenKind::Slash) = parser.peek_nth_kind(1) {
-                    break;
-                }
-
+            TokenKind::Identifier | TokenKind::Number => {
                 parts.push(token.lexeme.clone());
                 parser.advance();
-            }
-
-            TokenKind::Identifier => {
-                // Stop parsing entity name if next token is ':' or if already have one ident and current might be a param
-                if parts.len() >= 1 {
-                    break; // we've already got the entity
-                }
-
-                if token.lexeme == "auto" {
+                if parser.peek_kind() != Some(TokenKind::Dot) {
                     break;
                 }
-
-                parts.push(token.lexeme.clone());
-                parser.advance();
             }
-
             TokenKind::Dot => {
-                parser.advance(); // continue chaining
+                parser.advance();
+            }
+            TokenKind::Newline | TokenKind::EOF | TokenKind::Indent | TokenKind::Dedent => {
+                break; // Stop at newline or dedent
             }
-
             _ => {
                 break;
             }
         }
     }
 
-    let entity = if parts.len() == 1 { parts[0].clone() } else { parts[..=1].join(".") };
-
-    if entity.is_empty() {
-        return Statement {
-            kind: StatementKind::Trigger {
-                entity: String::new(),
-                duration: Duration::Auto,
-            },
-            value: Value::Null,
-            indent: dot_token.indent,
-            line: dot_token.line,
-            column: dot_token.column,
-        };
-    }
-
-    // Check if there's a duration
-    let next = parser.peek_clone();
-
-    let (duration, value) = match next {
-        None => (Duration::Auto, Value::Null),
-
-        Some(token) =>
-            match token.kind {
-                TokenKind::Newline | TokenKind::EOF => (Duration::Auto, Value::Null),
-
-                TokenKind::Number => {
-                    let numerator = token.lexeme.clone();
-                    parser.advance(); // consume numerator
-
-                    if let Some(TokenKind::Slash) = parser.peek_kind() {
-                        parser.advance(); // consume slash
-
-                        if let Some(denominator_token) = parser.peek_clone() {
-                            if denominator_token.kind == TokenKind::Number {
-                                let denominator = denominator_token.lexeme.clone();
-                                parser.advance(); // consume denominator
-
-                                let beat_str = format!("{}/{}", numerator, denominator);
-                                let beat_duration = Duration::Beat(beat_str);
-
-                                let val = match parser.peek_clone() {
-                                    Some(param_token) if
-                                        param_token.kind == TokenKind::Identifier
-                                    => {
-                                        parser.advance();
-                                        Value::Identifier(param_token.lexeme.clone())
-                                    }
-                                    Some(param_token) if param_token.kind == TokenKind::LBrace => {
-                                        parser.parse_map_value().unwrap_or(Value::Null)
-                                    }
-                                    _ => Value::Null,
-                                };
-
-                                return Statement {
-                                    kind: StatementKind::Trigger {
-                                        entity,
-                                        duration: beat_duration,
-                                    },
-                                    value: val,
-                                    indent: dot_token.indent,
-                                    line: dot_token.line,
-                                    column: dot_token.column,
-                                };
-                            }
-                        }
-                    }
+    // Build entity name properly
+    let entity = if !parts.is_empty() {
+        parts.join(".") // only join within the same line
+    } else {
+        eprintln!("⚠️ Empty entity after '.' at line {}", dot_token.line);
+        String::new()
+    };
 
-                    // fallback: simple numeric duration
-                    let duration = parse_duration(numerator);
+    // Optional duration and effects map
+    let mut duration = Duration::Auto;
+    let mut value = Value::Null;
 
-                    let val = match parser.peek_clone() {
-                        Some(param_token) if param_token.kind == TokenKind::Identifier => {
+    if let Some(token) = parser.peek_clone() {
+        match token.kind {
+            TokenKind::Number => {
+                let numerator = token.lexeme.clone();
+                parser.advance();
+                if let Some(TokenKind::Slash) = parser.peek_kind() {
+                    parser.advance();
+                    if let Some(denominator_token) = parser.peek_clone() {
+                        if denominator_token.kind == TokenKind::Number {
+                            let denominator = denominator_token.lexeme.clone();
                             parser.advance();
-                            Value::Identifier(param_token.lexeme.clone())
+                            duration = Duration::Beat(format!("{}/{}", numerator, denominator));
                         }
-                        Some(param_token) if param_token.kind == TokenKind::LBrace => {
-                            parser.parse_map_value().unwrap_or(Value::Null)
-                        }
-                        _ => Value::Null,
-                    };
-
-                    (duration, val)
+                    }
+                } else {
+                    duration = parse_duration(numerator);
                 }
-
-                TokenKind::Identifier => {
-                    let duration_lexeme = token.lexeme.clone();
-                    parser.advance(); // consume duration
-
-                    let val = match parser.peek_clone() {
-                        Some(param_token) if param_token.kind == TokenKind::Identifier => {
-                            parser.advance();
-                            Value::Identifier(param_token.lexeme.clone())
-                        }
-                        Some(param_token) if param_token.kind == TokenKind::LBrace => {
-                            parser.parse_map_value().unwrap_or(Value::Null)
-                        }
-                        _ => Value::Null,
-                    };
-
-                    (parse_duration(duration_lexeme), val)
+                if let Some(next) = parser.peek_clone() {
+                    if next.kind == TokenKind::LBrace {
+                        value = parser.parse_map_value().unwrap_or(Value::Null);
+                    }
                 }
-
-                _ => (Duration::Auto, Value::Null),
             }
-    };
+            TokenKind::Identifier => {
+                let id = token.lexeme.clone();
+                parser.advance();
+                duration = parse_duration(id);
+                if let Some(next) = parser.peek_clone() {
+                    if next.kind == TokenKind::LBrace {
+                        value = parser.parse_map_value().unwrap_or(Value::Null);
+                    }
+                }
+            }
+            TokenKind::LBrace => {
+                value = parser.parse_map_value().unwrap_or(Value::Null);
+            }
+            _ => {}
+        }
+    }
 
     Statement {
-        kind: StatementKind::Trigger { entity, duration },
-        value,
+        kind: StatementKind::Trigger {
+            entity,
+            duration,
+            effects: Some(value.clone()),
+        },
+        value: Value::Null,
         indent: dot_token.indent,
         line: dot_token.line,
         column: dot_token.column,

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

@@ -1,6 +1,6 @@
 use crate::core::{
-    lexer::token::{ Token, TokenKind },
-    parser::{ statement::{ Statement, StatementKind }, driver::Parser },
+    lexer::token::{Token, TokenKind},
+    parser::{statement::{Statement, StatementKind}, driver::Parser},
     shared::value::Value,
     store::global::GlobalStore,
 };
@@ -8,34 +8,81 @@ use crate::core::{
 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 Statement::error(
+                current_token,
+                "Expected function name after 'call'".to_string()
+            );
         }
-    } else {
+    };
+
+    if name_token.kind != TokenKind::Identifier {
         return Statement::error(
-            current_token,
-            "Expected identifier or string after 'call'".to_string()
+            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 '('
 
-    return Statement {
-        kind: StatementKind::Call,
-        value,
+            // 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 Statement::error(
+                            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/function.rs

@@ -0,0 +1,92 @@
+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();
+    let mut body = 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());
+    }
+
+    // arse those tokens into block statements
+    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/let_.rs

@@ -4,7 +4,7 @@ use crate::core::{
     lexer::token::{ Token, TokenKind },
     parser::{
         driver::Parser,
-        handler::identifier::synth::parse_synth_token,
+        handler::{ dot::parse_dot_token, identifier::synth::parse_synth_token },
         statement::{ Statement, StatementKind },
     },
     shared::value::Value,
@@ -33,21 +33,15 @@ pub fn parse_let_token(
         return Statement::error(current_token, "Expected '=' after identifier".to_string());
     }
 
-    if let Some(token) = parser.peek_clone() {
-        if token.kind == TokenKind::Synth {
+    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);
-
-            return Statement {
-                kind: StatementKind::Let { name: identifier },
-                value: synth_stmt.value,
-                indent: current_token.indent,
-                line: current_token.line,
-                column: current_token.column,
-            };
+            Value::Statement(Box::new(synth_stmt))
         }
-    }
-
-    let value = match parser.peek_clone() {
         Some(token) if token.kind == TokenKind::Identifier => {
             parser.advance();
             Value::Identifier(token.lexeme.clone())
@@ -65,7 +59,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() {
@@ -117,15 +112,14 @@ 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 Statement::error(current_token, "Unhandled value type after '='".to_string());
         }
     };
 
     Statement {
         kind: StatementKind::Let { name: identifier },
-        value,
+        value: value,
         indent: current_token.indent,
         line: current_token.line,
         column: current_token.column,

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

@@ -4,6 +4,7 @@ pub mod call;
 pub mod spawn;
 pub mod sleep;
 pub mod synth;
+pub mod function;
 
 use crate::core::{
     parser::{

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

@@ -8,34 +8,81 @@ use crate::core::{
 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 {
+    parser.advance(); // consume "spawn"
+
+    // Expect function name
+    let name_token = match parser.peek_clone() {
+        Some(t) => t,
+        None => {
             return Statement::error(
                 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 Statement::error(
+            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 Statement::error(
+                            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,
+    }
+}