rustleaf 0.1.0

A simple programming language interpreter written in Rust
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
use super::statement::{parse_literal_value, parse_pattern};
use super::stream::TokenStream;
use crate::core::*;
use crate::lexer::TokenType;
use crate::trace;
use anyhow::{anyhow, Result};

/// Main entry point for parsing expressions
pub fn parse_expression(s: &mut TokenStream) -> Result<Expression> {
    trace!(
        "parse_expression: starting at position {} ({})",
        s.position(),
        s.current_token_info()
    );
    let result = parse_precedence(s, 0);
    if result.is_ok() {
        trace!("parse_expression: success - parsed precedence expression");
    } else {
        trace!(
            "parse_expression: failed - {}",
            result.as_ref().err().unwrap()
        );
    }
    result
}

/// Parse expressions with precedence climbing
fn parse_precedence(s: &mut TokenStream, min_precedence: u8) -> Result<Expression> {
    let mut left = parse_unary(s)?;

    while !s.is_at_end() {
        let op_precedence = get_binary_precedence(s.peek_type());
        if op_precedence < min_precedence {
            break;
        }

        // Binary operators
        if let Some(expr_constructor) = get_binary_expression_constructor(s.peek_type()) {
            s.accept_type(s.peek_type())?; // Consume the operator
            let right_precedence = if is_right_associative_token(s.peek_type()) {
                op_precedence
            } else {
                op_precedence + 1
            };
            let right = parse_precedence(s, right_precedence)?;
            left = expr_constructor(Box::new(left), Box::new(right));
        } else {
            break;
        }
    }

    Ok(left)
}

/// Parse unary expressions
fn parse_unary(s: &mut TokenStream) -> Result<Expression> {
    // Handle unary prefix operators
    if s.accept_type(TokenType::Not)?.is_some() {
        let expr = Box::new(parse_postfix(s)?);
        return Ok(Expression::Not(expr));
    }
    if s.accept_type(TokenType::Minus)?.is_some() {
        let expr = Box::new(parse_postfix(s)?);
        return Ok(Expression::Neg(expr));
    }
    if s.accept_type(TokenType::Plus)?.is_some() {
        // Unary plus is not in the AST, just return the expression
        return parse_postfix(s);
    }

    parse_postfix(s)
}

/// Parse postfix expressions (function calls, array access, property access)
fn parse_postfix(s: &mut TokenStream) -> Result<Expression> {
    let mut expr = parse_primary(s)?;

    // Check if this expression contains blocks - if so, disallow postfix operations
    if expression_contains_blocks(&expr) {
        return Ok(expr);
    }

    loop {
        if s.accept_type(TokenType::Dot)?.is_some() {
            let property_token = s.expect_type(TokenType::Ident)?;
            let property = property_token
                .text
                .ok_or_else(|| anyhow!("Identifier token missing text"))?;
            expr = Expression::GetAttr(Box::new(expr), property);
        } else if s.accept_type(TokenType::LeftBracket)?.is_some() {
            let index = parse_expression(s)?;
            s.expect_type(TokenType::RightBracket)?;
            expr = Expression::GetItem(Box::new(expr), Box::new(index));
        } else if s.accept_type(TokenType::LeftParen)?.is_some() {
            let mut args = Vec::new();

            loop {
                if s.is_at_end() {
                    return Err(anyhow!("Unexpected EOF in function call arguments"));
                }

                if s.accept_type(TokenType::RightParen)?.is_some() {
                    break;
                }

                args.push(parse_expression(s)?);
                if s.accept_type(TokenType::Comma)?.is_none() {
                    s.expect_type(TokenType::RightParen)?;
                    break;
                }
            }

            // Check if this is a method call (function call on a property access)
            expr = match expr {
                Expression::GetAttr(obj, method_name) => {
                    // Convert obj.method(args) to MethodCall
                    Expression::MethodCall(obj, method_name, args)
                }
                _ => {
                    // Regular function call
                    Expression::FunctionCall(Box::new(expr), args)
                }
            };
        } else {
            break;
        }
    }

    Ok(expr)
}

/// Check if an expression contains block constructs that shouldn't have postfix operations
fn expression_contains_blocks(expr: &Expression) -> bool {
    matches!(
        expr,
        Expression::If { .. }
            | Expression::Match { .. }
            | Expression::While { .. }
            | Expression::For { .. }
            | Expression::Loop { .. }
            | Expression::Try { .. }
            | Expression::With { .. }
            | Expression::Block(_)
    )
}

/// Parse primary expressions
fn parse_primary(s: &mut TokenStream) -> Result<Expression> {
    // Literals
    if s.accept_type(TokenType::True)?.is_some() {
        trace!("parse_primary: success - parsed boolean literal (true)");
        return Ok(Expression::Literal(LiteralValue::Bool(true)));
    }
    if s.accept_type(TokenType::False)?.is_some() {
        trace!("parse_primary: success - parsed boolean literal (false)");
        return Ok(Expression::Literal(LiteralValue::Bool(false)));
    }
    if s.accept_type(TokenType::Null)?.is_some() {
        trace!("parse_primary: success - parsed null literal");
        return Ok(Expression::Literal(LiteralValue::Null));
    }

    // Identifiers (must come before literal parsing to avoid conflicts)
    if let Some(token) = s.accept_type(TokenType::Ident)? {
        let name = token
            .text
            .ok_or_else(|| anyhow!("Identifier token missing text"))?;
        trace!("parse_primary: success - parsed identifier ({})", name);
        return Ok(Expression::Identifier(name));
    }

    // Try numeric and string literals
    if let Some(literal) = s.try_parse(|s| match parse_literal_value(s) {
        Ok(value) => Ok(Some(Expression::Literal(value))),
        Err(_) => Ok(None),
    })? {
        trace!("parse_primary: success - parsed numeric/string literal");
        return Ok(literal);
    }

    // Control flow expressions
    if s.accept_type(TokenType::If)?.is_some() {
        trace!("parse_primary: success - parsing if expression");
        return parse_if_expression(s);
    }
    if s.accept_type(TokenType::Match)?.is_some() {
        trace!("parse_primary: success - parsing match expression");
        return parse_match_expression(s);
    }
    if s.accept_type(TokenType::While)?.is_some() {
        trace!("parse_primary: success - parsing while expression");
        return parse_while_expression(s);
    }
    if s.accept_type(TokenType::For)?.is_some() {
        trace!("parse_primary: success - parsing for expression");
        return parse_for_expression(s);
    }
    if s.accept_type(TokenType::Loop)?.is_some() {
        trace!("parse_primary: success - parsing loop expression");
        return parse_loop_expression(s);
    }
    if s.accept_type(TokenType::Try)?.is_some() {
        trace!("parse_primary: success - parsing try expression");
        return parse_try_expression(s);
    }
    if s.accept_type(TokenType::With)?.is_some() {
        trace!("parse_primary: success - parsing with expression");
        return parse_with_expression(s);
    }

    // Lambda expressions
    if s.peek_type() == TokenType::Pipe {
        trace!("parse_primary: success - parsing lambda expression");
        return parse_lambda_expression(s);
    }

    // Collections
    if s.accept_type(TokenType::LeftBracket)?.is_some() {
        trace!("parse_primary: success - parsing list literal");
        return parse_list_literal(s);
    }
    if s.peek_type() == TokenType::LeftBrace {
        // Could be block or dict - need to check
        trace!("parse_primary: success - parsing block or dict");
        return parse_block_or_dict(s);
    }

    // Parenthesized expressions
    if s.accept_type(TokenType::LeftParen)?.is_some() {
        trace!("parse_primary: success - parsing parenthesized expression");
        let expr = parse_expression(s)?;
        s.expect_type(TokenType::RightParen)?;
        return Ok(expr);
    }

    // Interpolated strings
    if s.peek_type() == TokenType::StringPart || s.peek_type() == TokenType::InterpolationStart {
        trace!("parse_primary: success - parsing interpolated string");
        return parse_interpolated_string(s);
    }

    let current_token = s.current_token_info();
    trace!(
        "parse_primary: failed - no matching primary expression for {}",
        current_token
    );
    Err(anyhow!("Expected expression, found {:?}", s.peek_type()))
}

// Helper functions

fn get_binary_precedence(token_type: TokenType) -> u8 {
    match token_type {
        TokenType::Or => 1,
        TokenType::And => 2,
        TokenType::EqualEqual | TokenType::BangEqual => 3,
        TokenType::Less | TokenType::Greater | TokenType::LessEqual | TokenType::GreaterEqual => 4,
        TokenType::In | TokenType::Is | TokenType::IsNot => 5,
        TokenType::DotDot | TokenType::DotDotEqual => 6, // Range operators
        TokenType::Plus | TokenType::Minus => 11,
        TokenType::Star | TokenType::Slash | TokenType::Percent => 12,
        TokenType::StarStar => 13,
        TokenType::Pipe => 2, // Pipe (|) operator - low precedence
        TokenType::Dot | TokenType::LeftBracket | TokenType::LeftParen => 15,
        _ => 0, // Not a binary operator
    }
}

fn is_right_associative_token(token_type: TokenType) -> bool {
    matches!(token_type, TokenType::StarStar)
}

type BinaryExpressionConstructor = fn(Box<Expression>, Box<Expression>) -> Expression;

fn get_binary_expression_constructor(token_type: TokenType) -> Option<BinaryExpressionConstructor> {
    match token_type {
        TokenType::Plus => Some(Expression::Add),
        TokenType::Minus => Some(Expression::Sub),
        TokenType::Star => Some(Expression::Mul),
        TokenType::Slash => Some(Expression::Div),
        TokenType::Percent => Some(Expression::Mod),
        TokenType::StarStar => Some(Expression::Pow),
        TokenType::EqualEqual => Some(Expression::Eq),
        TokenType::BangEqual => Some(Expression::Ne),
        TokenType::Less => Some(Expression::Lt),
        TokenType::Greater => Some(Expression::Gt),
        TokenType::LessEqual => Some(Expression::Le),
        TokenType::GreaterEqual => Some(Expression::Ge),
        TokenType::And => Some(Expression::And),
        TokenType::Or => Some(Expression::Or),
        TokenType::In => Some(Expression::In),
        TokenType::Is => Some(Expression::Is),
        TokenType::IsNot => Some(Expression::IsNot),
        TokenType::Pipe => Some(Expression::Pipe), // Pipe (|) operator
        TokenType::DotDot => Some(Expression::RangeExclusive),
        TokenType::DotDotEqual => Some(Expression::RangeInclusive),
        _ => None,
    }
}

// Expression parsing functions - placeholders for now

pub fn parse_block_expression(s: &mut TokenStream) -> Result<Expression> {
    let mut statements = Vec::new();
    let mut final_expr = None;

    // Parse statements and possible final expression
    while !s.is_at_end() && s.peek_type() != TokenType::RightBrace {
        // Debug: Check for specific problematic case
        if s.peek_type() == TokenType::LeftBracket {
            println!(
                "DEBUG: Found [, after parsing statements: {:?}",
                statements.last()
            );
        }

        // Try to parse a statement first
        if let Some(stmt) = s.try_parse(|s| match super::statement::parse_statement(s) {
            Ok(stmt) => Ok(Some(stmt)),
            Err(_) => Ok(None),
        })? {
            statements.push(stmt);
        } else {
            // Failed to parse as statement, try as expression
            if let Some(expr) = s.try_parse(|s| match parse_expression(s) {
                Ok(expr) => Ok(Some(expr)),
                Err(_) => Ok(None),
            })? {
                // Check if this is followed by a semicolon
                if s.accept_type(TokenType::Semicolon)?.is_some() {
                    // It's an expression statement
                    statements.push(Statement::Expression(expr));
                } else {
                    // It's the final expression
                    final_expr = Some(Box::new(expr));
                    break;
                }
            } else {
                // Neither statement nor expression worked
                return Err(anyhow!("Expected statement or expression"));
            }
        }
    }

    s.expect_type(TokenType::RightBrace)?;
    Ok(Expression::Block(Block {
        statements,
        final_expr,
    }))
}

fn parse_if_expression(s: &mut TokenStream) -> Result<Expression> {
    // 'if' already consumed
    let condition = Box::new(parse_expression(s)?);

    s.expect_type(TokenType::LeftBrace)?;
    let then_block_expr = parse_block_expression(s)?;
    let then_expr = match then_block_expr {
        Expression::Block(block) => block,
        _ => unreachable!("parse_block_expression should return a Block"),
    };

    let else_expr = if s.accept_type(TokenType::Else)?.is_some() {
        if s.peek_type() == TokenType::If {
            // else if - convert the if expression to a block
            s.accept_type(TokenType::If)?;
            let else_if_expr = parse_if_expression(s)?;
            Some(Block {
                statements: vec![Statement::Expression(else_if_expr)],
                final_expr: None,
            })
        } else {
            s.expect_type(TokenType::LeftBrace)?;
            let else_block_expr = parse_block_expression(s)?;
            match else_block_expr {
                Expression::Block(block) => Some(block),
                _ => unreachable!("parse_block_expression should return a Block"),
            }
        }
    } else {
        None
    };

    Ok(Expression::If {
        condition,
        then_expr,
        else_expr,
    })
}

fn parse_match_expression(s: &mut TokenStream) -> Result<Expression> {
    // 'match' already consumed
    let expr = Box::new(parse_expression(s)?);
    s.expect_type(TokenType::LeftBrace)?;

    let mut cases = Vec::new();

    while !s.is_at_end() && s.peek_type() != TokenType::RightBrace {
        let pattern = parse_pattern(s)?;

        let guard = if s.accept_type(TokenType::If)?.is_some() {
            Some(parse_expression(s)?)
        } else {
            None
        };

        s.expect_type(TokenType::Colon)?;
        s.expect_type(TokenType::LeftBrace)?;
        let body_expr = parse_block_expression(s)?;
        let body = match body_expr {
            Expression::Block(block) => block,
            _ => unreachable!("parse_block_expression should return a Block"),
        };

        cases.push(MatchCase {
            pattern,
            guard,
            body,
        });

        // Optional comma between cases
        s.accept_type(TokenType::Comma)?;
    }

    s.expect_type(TokenType::RightBrace)?;
    Ok(Expression::Match { expr, cases })
}

fn parse_while_expression(s: &mut TokenStream) -> Result<Expression> {
    // 'while' already consumed
    let condition = Box::new(parse_expression(s)?);
    s.expect_type(TokenType::LeftBrace)?;
    // Parse as block expression to support final expressions
    let block_expr = parse_block_expression(s)?;
    let body = match block_expr {
        Expression::Block(block) => block,
        _ => unreachable!("parse_block_expression should return a Block"),
    };

    Ok(Expression::While { condition, body })
}

fn parse_for_expression(s: &mut TokenStream) -> Result<Expression> {
    // 'for' already consumed
    let pattern = parse_pattern(s)?;
    s.expect_type(TokenType::In)?;
    let iterable = Box::new(parse_expression(s)?);
    s.expect_type(TokenType::LeftBrace)?;
    // Parse as block expression to support final expressions
    let block_expr = parse_block_expression(s)?;
    let body = match block_expr {
        Expression::Block(block) => block,
        _ => unreachable!("parse_block_expression should return a Block"),
    };

    Ok(Expression::For {
        pattern,
        iter: iterable,
        body,
    })
}

fn parse_loop_expression(s: &mut TokenStream) -> Result<Expression> {
    // 'loop' already consumed
    s.expect_type(TokenType::LeftBrace)?;
    // Parse as block expression to support final expressions and break values
    let block_expr = parse_block_expression(s)?;
    let body = match block_expr {
        Expression::Block(block) => block,
        _ => unreachable!("parse_block_expression should return a Block"),
    };

    Ok(Expression::Loop { body })
}

fn parse_try_expression(s: &mut TokenStream) -> Result<Expression> {
    // 'try' already consumed
    s.expect_type(TokenType::LeftBrace)?;
    let body_expr = parse_block_expression(s)?;
    let body = match body_expr {
        Expression::Block(block) => block,
        _ => unreachable!("parse_block_expression should return a Block"),
    };

    s.expect_type(TokenType::Catch)?;
    let pattern = parse_pattern(s)?;
    s.expect_type(TokenType::LeftBrace)?;
    let catch_expr = parse_block_expression(s)?;
    let catch_body = match catch_expr {
        Expression::Block(block) => block,
        _ => unreachable!("parse_block_expression should return a Block"),
    };

    Ok(Expression::Try {
        body,
        catch: CatchClause {
            pattern,
            body: catch_body,
        },
    })
}

fn parse_with_expression(s: &mut TokenStream) -> Result<Expression> {
    // 'with' already consumed
    let resources;

    // Helper to parse resource form (name = expr)
    let parse_resource_form = |s: &mut TokenStream| -> Result<Vec<WithResource>> {
        let mut resources = Vec::new();
        loop {
            let name_token = s.expect_type(TokenType::Ident)?;
            let name = name_token
                .text
                .ok_or_else(|| anyhow!("Identifier token missing text"))?;
            s.expect_type(TokenType::Equal)?;
            let value = parse_expression(s)?;

            resources.push(WithResource { name, value });

            if s.accept_type(TokenType::Comma)?.is_none() {
                break;
            }
        }
        // Optional colon before block
        s.accept_type(TokenType::Colon)?;
        Ok(resources)
    };

    // Try to parse as simple expression form first
    if let Some(result) = s.try_parse(|s| {
        let expr = match parse_unary(s) {
            Ok(expr) => expr,
            Err(_) => return Ok(None),
        };
        // Check if next token is a block start
        if s.peek_type() == TokenType::LeftBrace {
            // Simple form: with expr { ... }
            Ok(Some(vec![WithResource {
                name: String::new(),
                value: expr,
            }]))
        } else if s.peek_type() == TokenType::Comma || s.peek_type() == TokenType::Colon {
            // Actually resource form, fail this parse attempt
            Ok(None)
        } else {
            Ok(None)
        }
    })? {
        resources = result;
    } else {
        // Must be resource form (name = expr)
        resources = parse_resource_form(s)?;
    }

    // Parse body
    s.expect_type(TokenType::LeftBrace)?;
    let body_expr = parse_block_expression(s)?;
    let body = match body_expr {
        Expression::Block(block) => block,
        _ => unreachable!("parse_block_expression should return a Block"),
    };

    Ok(Expression::With { resources, body })
}

fn parse_lambda_expression(s: &mut TokenStream) -> Result<Expression> {
    // Parse opening |
    s.expect_type(TokenType::Pipe)?;

    let mut params = Vec::new();

    // Parse parameters
    while s.peek_type() != TokenType::Pipe {
        let param_token = s.expect_type(TokenType::Ident)?;
        let param = param_token
            .text
            .ok_or_else(|| anyhow!("Identifier token missing text"))?;
        params.push(param);

        if s.peek_type() != TokenType::Pipe {
            s.expect_type(TokenType::Comma)?;
        }
    }

    // Parse closing |
    s.expect_type(TokenType::Pipe)?;

    // Parse body - either an expression or a block
    let body = if s.peek_type() == TokenType::LeftBrace {
        s.expect_type(TokenType::LeftBrace)?;
        // Parse as block expression with potential final expression
        let block_expr = parse_block_expression(s)?;
        match block_expr {
            Expression::Block(block) => LambdaBody::Block(block),
            _ => unreachable!("parse_block_expression should return a Block"),
        }
    } else {
        LambdaBody::Expression(Box::new(parse_expression(s)?))
    };

    Ok(Expression::Lambda { params, body })
}

fn parse_list_literal(s: &mut TokenStream) -> Result<Expression> {
    // We already consumed the [
    trace!("parse_list_literal: starting at position {}", s.position());
    let mut elements = Vec::new();

    // Handle empty list
    if s.accept_type(TokenType::RightBracket)?.is_some() {
        trace!("parse_list_literal: empty list");
        return Ok(Expression::List(elements));
    }

    loop {
        trace!(
            "parse_list_literal: parsing element at position {}",
            s.position()
        );
        elements.push(parse_expression(s)?);

        if s.accept_type(TokenType::Comma)?.is_some() {
            trace!("parse_list_literal: found comma, checking for more elements");
            // Check for trailing comma
            if s.peek_type() == TokenType::RightBracket {
                trace!("parse_list_literal: trailing comma before ]");
                break;
            }
        } else {
            trace!("parse_list_literal: no comma, expecting ]");
            break;
        }
    }

    trace!(
        "parse_list_literal: expecting ] at position {}",
        s.position()
    );
    s.expect_type(TokenType::RightBracket)?;
    trace!("parse_list_literal: success");
    Ok(Expression::List(elements))
}

fn parse_block_or_dict(s: &mut TokenStream) -> Result<Expression> {
    s.expect_type(TokenType::LeftBrace)?;

    // Handle empty dict: {}
    if s.accept_type(TokenType::RightBrace)?.is_some() {
        return Ok(Expression::Dict(Vec::new()));
    }

    // Try to parse as dictionary first, fall back to block
    if let Some(dict_expr) = s.try_parse(|s| {
        let mut pairs = Vec::new();

        loop {
            // Parse key expression - use high precedence to avoid consuming colons
            let key = match parse_precedence(s, 14) {
                Ok(key) => key,
                Err(_) => return Ok(None),
            };

            // Must be followed by ':'
            if s.accept_type(TokenType::Colon)?.is_none() {
                return Ok(None);
            }

            // Parse value expression
            let value = match parse_expression(s) {
                Ok(value) => value,
                Err(_) => return Ok(None),
            };

            pairs.push((key, value));

            // Check for continuation
            if s.accept_type(TokenType::Comma)?.is_some() {
                // Allow trailing comma before }
                if s.peek_type() == TokenType::RightBrace {
                    break;
                }
                continue;
            } else {
                break;
            }
        }

        if s.accept_type(TokenType::RightBrace)?.is_none() {
            return Ok(None);
        }
        Ok(Some(Expression::Dict(pairs)))
    })? {
        return Ok(dict_expr);
    }

    // Parse as block expression (opening { already consumed)
    let result = parse_block_expression(s)?;
    Ok(result)
}

fn parse_interpolated_string(s: &mut TokenStream) -> Result<Expression> {
    let mut parts = Vec::new();

    // Parse string parts and interpolations
    while !s.is_at_end() {
        // Check for string part
        if let Some(token) = s.accept_type(TokenType::StringPart)? {
            if let Some(text) = token.text {
                parts.push(InterpolationPart::Text(text));
            }
        }

        // Check for interpolation start
        if s.accept_type(TokenType::InterpolationStart)?.is_some() {
            let expr = parse_expression(s)?;
            s.expect_type(TokenType::InterpolationEnd)?;
            parts.push(InterpolationPart::Expression(expr));
        } else {
            // No more interpolations
            break;
        }
    }

    if parts.is_empty() {
        return Err(anyhow!("Expected interpolated string"));
    }

    Ok(Expression::InterpolatedString(parts))
}