Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,9 @@ fn parse_block(arena: &mut ExprArena, typevars: &[Name], cx: &mut ParseContext)

r.push(parse_stmt(arena, typevars, cx));

if cx.lex.tok != Token::Endl {
// Statements are separated by newlines or semicolons. Semicolons let
// multiple statements share a line.
if cx.lex.tok != Token::Endl && cx.lex.tok != Token::Semi {
break;
}

Expand Down Expand Up @@ -1461,6 +1463,12 @@ mod tests {
"{ x = y\n z = w }",
"{ f(x)\n g(y) }",
"{ var x = y\n var z = w }",
"{ x; y }",
"{ x; }",
"{ x;\n y }",
"{ x = y; z = w }",
"{ var x = y; var z = w; f(x) }",
"{ while x { y; z }; w }",
],
);
}
Expand Down
25 changes: 25 additions & 0 deletions tests/cases/semicolons.lyte
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// expected stdout:
// compilation successful
// assert(true)
// assert(true)
// assert(true)
// assert(true)

sum_three(a: i32, b: i32, c: i32) -> i32 {
var t = 0; t = t + a; t = t + b
t = t + c
return t
}

main {
var x = 1; var y = 2; var z = x + y
assert(z == 3)

// Trailing semicolon before the closing brace.
assert(sum_three(1, 2, 3) == 6);

var i = 0
while i < 3 { i = i + 1; x = x + i }
assert(i == 3)
assert(x == 7)
}
Loading