@devaloop/devalang 0.0.1-beta.1 → 0.0.1-beta.2

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

@@ -1,135 +1,135 @@
-use std::collections::HashMap;
-
-use devalang_types::Value;
-
-use crate::core::{
-    lexer::token::Token,
-    parser::{
-        driver::Parser,
-        handler::dot::parse_dot_token,
-        statement::{Statement, StatementKind},
-    },
-    store::global::GlobalStore,
-};
-
-pub fn parse_synth_token(
-    parser: &mut Parser,
-    _current_token: Token,
-    _global_store: &mut GlobalStore,
-) -> Statement {
-    parser.advance(); // consume 'synth'
-
-    let Some(synth_token) = parser.previous_clone() else {
-        return Statement::unknown();
-    };
-
-    // Expect a provider/waveform identifier (can be dotted: alias.synth)
-    // Also accept a dot-led entity by delegating to the dot parser (e.g. .module.export)
-    let synth_waveform = if let Some(first_token) = parser.peek_clone() {
-        use crate::core::lexer::token::TokenKind;
-
-        if first_token.kind == TokenKind::Dot {
-            // Parse dot-entity and extract its entity string
-            let dot_stmt = parse_dot_token(parser, _global_store);
-            // Extract entity if the parsed statement is a Trigger
-            match dot_stmt.kind {
-                StatementKind::Trigger { entity, .. } => entity,
-                _ => String::new(),
-            }
-        } else {
-            if first_token.kind != crate::core::lexer::token::TokenKind::Identifier
-                && first_token.kind != crate::core::lexer::token::TokenKind::Number
-                && first_token.kind != crate::core::lexer::token::TokenKind::Synth
-            {
-                return crate::core::parser::statement::error_from_token(
-                    first_token.clone(),
-                    "Expected identifier after 'synth'".to_string(),
-                );
-            }
-
-            // Collect dotted parts on the same line
-            let mut parts: Vec<String> = Vec::new();
-            let current_line = first_token.line;
-            loop {
-                let Some(tok) = parser.peek_clone() else {
-                    break;
-                };
-                if tok.line != current_line {
-                    break;
-                }
-                match tok.kind {
-                    crate::core::lexer::token::TokenKind::Identifier
-                    | crate::core::lexer::token::TokenKind::Number
-                    | crate::core::lexer::token::TokenKind::Synth => {
-                        parts.push(tok.lexeme.clone());
-                        parser.advance();
-                        // If next isn't a dot on same line, stop
-                        if let Some(next) = parser.peek_clone() {
-                            if !(next.line == current_line
-                                && next.kind == crate::core::lexer::token::TokenKind::Dot)
-                            {
-                                break;
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-                    crate::core::lexer::token::TokenKind::Dot => {
-                        parser.advance();
-                    }
-                    _ => break,
-                }
-            }
-
-            parts.join(".")
-        }
-    } else {
-        return crate::core::parser::statement::error_from_token(
-            synth_token,
-            "Expected identifier after 'synth'".to_string(),
-        );
-    };
-
-    // Skip formatting before optional parameters map
-    while parser.check_token(crate::core::lexer::token::TokenKind::Newline)
-        || parser.check_token(crate::core::lexer::token::TokenKind::Indent)
-        || parser.check_token(crate::core::lexer::token::TokenKind::Dedent)
-        || parser.check_token(crate::core::lexer::token::TokenKind::Whitespace)
-    {
-        parser.advance();
-    }
-
-    // Expect synth optional parameters map
-    let parameters = if let Some(params) = parser.parse_map_value() {
-        // If parameters are provided, we expect a map
-        if let Value::Map(map) = params {
-            map
-        } else {
-            return crate::core::parser::statement::error_from_token(
-                synth_token,
-                "Expected a map for synth parameters".to_string(),
-            );
-        }
-    } else {
-        // If no parameters are provided, we can still create the statement with an empty map
-        HashMap::new()
-    };
-
-    Statement {
-        kind: StatementKind::Synth,
-        value: Value::Map(HashMap::from([
-            ("entity".to_string(), Value::String("synth".to_string())),
-            (
-                "value".to_string(),
-                Value::Map(HashMap::from([
-                    // Store waveform as identifier to allow resolution from variables/exports
-                    ("waveform".to_string(), Value::Identifier(synth_waveform)),
-                    ("parameters".to_string(), Value::Map(parameters)),
-                ])),
-            ),
-        ])),
-        indent: synth_token.indent,
-        line: synth_token.line,
-        column: synth_token.column,
-    }
-}
+use std::collections::HashMap;
+
+use devalang_types::Value;
+
+use crate::core::{
+    lexer::token::Token,
+    parser::{
+        driver::parser::Parser,
+        handler::dot::parse_dot_token,
+        statement::{Statement, StatementKind},
+    },
+    store::global::GlobalStore,
+};
+
+pub fn parse_synth_token(
+    parser: &mut Parser,
+    _current_token: Token,
+    _global_store: &mut GlobalStore,
+) -> Statement {
+    parser.advance(); // consume 'synth'
+
+    let Some(synth_token) = parser.previous_clone() else {
+        return Statement::unknown();
+    };
+
+    // Expect a provider/waveform identifier (can be dotted: alias.synth)
+    // Also accept a dot-led entity by delegating to the dot parser (e.g. .module.export)
+    let synth_waveform = if let Some(first_token) = parser.peek_clone() {
+        use crate::core::lexer::token::TokenKind;
+
+        if first_token.kind == TokenKind::Dot {
+            // Parse dot-entity and extract its entity string
+            let dot_stmt = parse_dot_token(parser, _global_store);
+            // Extract entity if the parsed statement is a Trigger
+            match dot_stmt.kind {
+                StatementKind::Trigger { entity, .. } => entity,
+                _ => String::new(),
+            }
+        } else {
+            if first_token.kind != crate::core::lexer::token::TokenKind::Identifier
+                && first_token.kind != crate::core::lexer::token::TokenKind::Number
+                && first_token.kind != crate::core::lexer::token::TokenKind::Synth
+            {
+                return crate::core::parser::statement::error_from_token(
+                    first_token.clone(),
+                    "Expected identifier after 'synth'".to_string(),
+                );
+            }
+
+            // Collect dotted parts on the same line
+            let mut parts: Vec<String> = Vec::new();
+            let current_line = first_token.line;
+            loop {
+                let Some(tok) = parser.peek_clone() else {
+                    break;
+                };
+                if tok.line != current_line {
+                    break;
+                }
+                match tok.kind {
+                    crate::core::lexer::token::TokenKind::Identifier
+                    | crate::core::lexer::token::TokenKind::Number
+                    | crate::core::lexer::token::TokenKind::Synth => {
+                        parts.push(tok.lexeme.clone());
+                        parser.advance();
+                        // If next isn't a dot on same line, stop
+                        if let Some(next) = parser.peek_clone() {
+                            if !(next.line == current_line
+                                && next.kind == crate::core::lexer::token::TokenKind::Dot)
+                            {
+                                break;
+                            }
+                        } else {
+                            break;
+                        }
+                    }
+                    crate::core::lexer::token::TokenKind::Dot => {
+                        parser.advance();
+                    }
+                    _ => break,
+                }
+            }
+
+            parts.join(".")
+        }
+    } else {
+        return crate::core::parser::statement::error_from_token(
+            synth_token,
+            "Expected identifier after 'synth'".to_string(),
+        );
+    };
+
+    // Skip formatting before optional parameters map
+    while parser.check_token(crate::core::lexer::token::TokenKind::Newline)
+        || parser.check_token(crate::core::lexer::token::TokenKind::Indent)
+        || parser.check_token(crate::core::lexer::token::TokenKind::Dedent)
+        || parser.check_token(crate::core::lexer::token::TokenKind::Whitespace)
+    {
+        parser.advance();
+    }
+
+    // Expect synth optional parameters map
+    let parameters = if let Some(params) = parser.parse_map_value() {
+        // If parameters are provided, we expect a map
+        if let Value::Map(map) = params {
+            map
+        } else {
+            return crate::core::parser::statement::error_from_token(
+                synth_token,
+                "Expected a map for synth parameters".to_string(),
+            );
+        }
+    } else {
+        // If no parameters are provided, we can still create the statement with an empty map
+        HashMap::new()
+    };
+
+    Statement {
+        kind: StatementKind::Synth,
+        value: Value::Map(HashMap::from([
+            ("entity".to_string(), Value::String("synth".to_string())),
+            (
+                "value".to_string(),
+                Value::Map(HashMap::from([
+                    // Store waveform as identifier to allow resolution from variables/exports
+                    ("waveform".to_string(), Value::Identifier(synth_waveform)),
+                    ("parameters".to_string(), Value::Map(parameters)),
+                ])),
+            ),
+        ])),
+        indent: synth_token.indent,
+        line: synth_token.line,
+        column: synth_token.column,
+    }
+}

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

@@ -1,194 +1,194 @@
-use devalang_types::Value;
-
-use crate::core::{
-    lexer::token::TokenKind,
-    parser::{
-        driver::Parser,
-        statement::{Statement, StatementKind},
-    },
-    store::global::GlobalStore,
-};
-
-pub fn parse_loop_token(parser: &mut Parser, global_store: &mut GlobalStore) -> Statement {
-    parser.advance(); // consume 'loop' or 'for' (aliased in lexer)
-    let Some(loop_token) = parser.previous_clone() else {
-        return Statement::unknown();
-    };
-
-    // Support two forms:
-    // 1) loop <count>:
-    // 2) for <ident> in [a,b,c]:
-
-    // Peek next to decide
-    let Some(next_token) = parser.peek_clone() else {
-        return Statement::error_with_pos(
-            loop_token.indent,
-            loop_token.line,
-            loop_token.column,
-            "Expected iterator after loop/for".to_string(),
-        );
-    };
-
-    // Try to detect 'for <ident> in [array]:' form
-    let mut foreach_ident: Option<String> = None;
-    if let TokenKind::Identifier = next_token.kind {
-        // Could be either count identifier (old form) or foreach variable
-        // Look ahead for 'in'
-        let name = next_token.lexeme.clone();
-        // don't consume yet; we'll branch
-        if let Some(t2) = parser.peek_nth(1) {
-            if t2.kind == TokenKind::Identifier && t2.lexeme == "in" {
-                // foreach form
-                foreach_ident = Some(name);
-                // consume ident and 'in'
-                parser.advance();
-                parser.advance();
-            }
-        }
-    }
-
-    if let Some(var_name) = foreach_ident {
-        // Expect [array] OR number OR string OR identifier after 'in'
-        let array_val = if let Some(tok) = parser.peek_clone() {
-            match tok.kind {
-                TokenKind::LBracket => {
-                    if let Some(v) = parser.parse_array_value() {
-                        v
-                    } else {
-                        Value::Array(vec![])
-                    }
-                }
-                TokenKind::Number => {
-                    parser.advance();
-                    let n = tok.lexeme.parse::<f32>().unwrap_or(0.0);
-                    Value::Number(n)
-                }
-                TokenKind::String => {
-                    parser.advance();
-                    Value::String(tok.lexeme.clone())
-                }
-                TokenKind::Identifier => {
-                    parser.advance();
-                    Value::Identifier(tok.lexeme.clone())
-                }
-                _ => {
-                    return Statement::error_with_pos(
-                        loop_token.indent,
-                        loop_token.line,
-                        loop_token.column,
-                        "Expected array, number, string or identifier after 'in'".to_string(),
-                    );
-                }
-            }
-        } else {
-            return Statement::error_with_pos(
-                loop_token.indent,
-                loop_token.line,
-                loop_token.column,
-                "Expected array, number, string or identifier after 'in'".to_string(),
-            );
-        };
-
-        // Expect ':'
-        if !parser.match_token(TokenKind::Colon) {
-            return Statement::error_with_pos(
-                loop_token.indent,
-                loop_token.line,
-                loop_token.column,
-                "Expected ':' after foreach header".to_string(),
-            );
-        }
-
-        let tokens =
-            parser.collect_until(|t| t.kind == TokenKind::Dedent || t.kind == TokenKind::EOF);
-        let loop_body = parser.parse_block(tokens.clone(), global_store);
-        if let Some(token) = parser.peek() {
-            if token.kind == TokenKind::Dedent {
-                parser.advance();
-            }
-        }
-
-        let mut value_map = std::collections::HashMap::new();
-        value_map.insert("foreach".to_string(), Value::Identifier(var_name));
-        value_map.insert("array".to_string(), array_val);
-        value_map.insert("body".to_string(), Value::Block(loop_body.clone()));
-
-        return Statement {
-            kind: StatementKind::Loop,
-            value: Value::Map(value_map),
-            indent: loop_token.indent,
-            line: loop_token.line,
-            column: loop_token.column,
-        };
-    }
-
-    // Fallback to legacy: loop <count>:
-    let Some(iterator_token) = parser.peek_clone() else {
-        return Statement::error_with_pos(
-            loop_token.indent,
-            loop_token.line,
-            loop_token.column,
-            "Expected number or identifier after 'loop'".to_string(),
-        );
-    };
-
-    let iterator_value = match iterator_token.kind {
-        TokenKind::Number => {
-            let val = iterator_token.lexeme.parse::<f32>().unwrap_or(1.0);
-            parser.advance();
-            Value::Number(val)
-        }
-        TokenKind::Identifier => {
-            let val = iterator_token.lexeme.clone();
-            parser.advance();
-            Value::Identifier(val)
-        }
-        TokenKind::String => {
-            // strings that are numeric (e.g. "10")
-            let s = iterator_token.lexeme.clone();
-            parser.advance();
-            Value::String(s)
-        }
-        _ => {
-            return Statement::error_with_pos(
-                iterator_token.clone().indent,
-                iterator_token.clone().line,
-                iterator_token.clone().column,
-                "Expected a number, string or identifier as loop count".to_string(),
-            );
-        }
-    };
-
-    if !parser.match_token(TokenKind::Colon) {
-        let message = format!(
-            "Expected ':' after loop count, got {:?}",
-            parser.peek_kind()
-        );
-        return Statement::error_with_pos(
-            loop_token.clone().indent,
-            loop_token.clone().line,
-            loop_token.clone().column,
-            message,
-        );
-    }
-
-    let tokens = parser.collect_until(|t| t.kind == TokenKind::Dedent || t.kind == TokenKind::EOF);
-    let loop_body = parser.parse_block(tokens.clone(), global_store);
-    if let Some(token) = parser.peek() {
-        if token.kind == TokenKind::Dedent {
-            parser.advance();
-        }
-    }
-
-    let mut value_map = std::collections::HashMap::new();
-    value_map.insert("iterator".to_string(), iterator_value);
-    value_map.insert("body".to_string(), Value::Block(loop_body.clone()));
-
-    Statement {
-        kind: StatementKind::Loop,
-        value: Value::Map(value_map),
-        indent: loop_token.indent,
-        line: loop_token.line,
-        column: loop_token.column,
-    }
-}
+use devalang_types::Value;
+
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
+    store::global::GlobalStore,
+};
+
+pub fn parse_loop_token(parser: &mut Parser, global_store: &mut GlobalStore) -> Statement {
+    parser.advance(); // consume 'loop' or 'for' (aliased in lexer)
+    let Some(loop_token) = parser.previous_clone() else {
+        return Statement::unknown();
+    };
+
+    // Support two forms:
+    // 1) loop <count>:
+    // 2) for <ident> in [a,b,c]:
+
+    // Peek next to decide
+    let Some(next_token) = parser.peek_clone() else {
+        return Statement::error_with_pos(
+            loop_token.indent,
+            loop_token.line,
+            loop_token.column,
+            "Expected iterator after loop/for".to_string(),
+        );
+    };
+
+    // Try to detect 'for <ident> in [array]:' form
+    let mut foreach_ident: Option<String> = None;
+    if let TokenKind::Identifier = next_token.kind {
+        // Could be either count identifier (old form) or foreach variable
+        // Look ahead for 'in'
+        let name = next_token.lexeme.clone();
+        // don't consume yet; we'll branch
+        if let Some(t2) = parser.peek_nth(1) {
+            if t2.kind == TokenKind::Identifier && t2.lexeme == "in" {
+                // foreach form
+                foreach_ident = Some(name);
+                // consume ident and 'in'
+                parser.advance();
+                parser.advance();
+            }
+        }
+    }
+
+    if let Some(var_name) = foreach_ident {
+        // Expect [array] OR number OR string OR identifier after 'in'
+        let array_val = if let Some(tok) = parser.peek_clone() {
+            match tok.kind {
+                TokenKind::LBracket => {
+                    if let Some(v) = parser.parse_array_value() {
+                        v
+                    } else {
+                        Value::Array(vec![])
+                    }
+                }
+                TokenKind::Number => {
+                    parser.advance();
+                    let n = tok.lexeme.parse::<f32>().unwrap_or(0.0);
+                    Value::Number(n)
+                }
+                TokenKind::String => {
+                    parser.advance();
+                    Value::String(tok.lexeme.clone())
+                }
+                TokenKind::Identifier => {
+                    parser.advance();
+                    Value::Identifier(tok.lexeme.clone())
+                }
+                _ => {
+                    return Statement::error_with_pos(
+                        loop_token.indent,
+                        loop_token.line,
+                        loop_token.column,
+                        "Expected array, number, string or identifier after 'in'".to_string(),
+                    );
+                }
+            }
+        } else {
+            return Statement::error_with_pos(
+                loop_token.indent,
+                loop_token.line,
+                loop_token.column,
+                "Expected array, number, string or identifier after 'in'".to_string(),
+            );
+        };
+
+        // Expect ':'
+        if !parser.match_token(TokenKind::Colon) {
+            return Statement::error_with_pos(
+                loop_token.indent,
+                loop_token.line,
+                loop_token.column,
+                "Expected ':' after foreach header".to_string(),
+            );
+        }
+
+        let tokens =
+            parser.collect_until(|t| t.kind == TokenKind::Dedent || t.kind == TokenKind::EOF);
+        let loop_body = parser.parse_block(tokens.clone(), global_store);
+        if let Some(token) = parser.peek() {
+            if token.kind == TokenKind::Dedent {
+                parser.advance();
+            }
+        }
+
+        let mut value_map = std::collections::HashMap::new();
+        value_map.insert("foreach".to_string(), Value::Identifier(var_name));
+        value_map.insert("array".to_string(), array_val);
+        value_map.insert("body".to_string(), Value::Block(loop_body.clone()));
+
+        return Statement {
+            kind: StatementKind::Loop,
+            value: Value::Map(value_map),
+            indent: loop_token.indent,
+            line: loop_token.line,
+            column: loop_token.column,
+        };
+    }
+
+    // Fallback to legacy: loop <count>:
+    let Some(iterator_token) = parser.peek_clone() else {
+        return Statement::error_with_pos(
+            loop_token.indent,
+            loop_token.line,
+            loop_token.column,
+            "Expected number or identifier after 'loop'".to_string(),
+        );
+    };
+
+    let iterator_value = match iterator_token.kind {
+        TokenKind::Number => {
+            let val = iterator_token.lexeme.parse::<f32>().unwrap_or(1.0);
+            parser.advance();
+            Value::Number(val)
+        }
+        TokenKind::Identifier => {
+            let val = iterator_token.lexeme.clone();
+            parser.advance();
+            Value::Identifier(val)
+        }
+        TokenKind::String => {
+            // strings that are numeric (e.g. "10")
+            let s = iterator_token.lexeme.clone();
+            parser.advance();
+            Value::String(s)
+        }
+        _ => {
+            return Statement::error_with_pos(
+                iterator_token.clone().indent,
+                iterator_token.clone().line,
+                iterator_token.clone().column,
+                "Expected a number, string or identifier as loop count".to_string(),
+            );
+        }
+    };
+
+    if !parser.match_token(TokenKind::Colon) {
+        let message = format!(
+            "Expected ':' after loop count, got {:?}",
+            parser.peek_kind()
+        );
+        return Statement::error_with_pos(
+            loop_token.clone().indent,
+            loop_token.clone().line,
+            loop_token.clone().column,
+            message,
+        );
+    }
+
+    let tokens = parser.collect_until(|t| t.kind == TokenKind::Dedent || t.kind == TokenKind::EOF);
+    let loop_body = parser.parse_block(tokens.clone(), global_store);
+    if let Some(token) = parser.peek() {
+        if token.kind == TokenKind::Dedent {
+            parser.advance();
+        }
+    }
+
+    let mut value_map = std::collections::HashMap::new();
+    value_map.insert("iterator".to_string(), iterator_value);
+    value_map.insert("body".to_string(), Value::Block(loop_body.clone()));
+
+    Statement {
+        kind: StatementKind::Loop,
+        value: Value::Map(value_map),
+        indent: loop_token.indent,
+        line: loop_token.line,
+        column: loop_token.column,
+    }
+}