samvv/bolt
1
0
Fork 0
Code Issues 24 Pull requests Projects Releases Packages Wiki Activity Actions

Enable parsing of tuple expressions

Browse source
This commit is contained in:
Sam Vervaeck 2022-09-16 10:25:24 +02:00
parent f11ad9028e
commit a378f8276d
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/parser.ts
View file

@ -259,17 +259,32 @@ export class Parser {
}
private parseExpressionWithParens(): Expression {
const elements = [];
const lparen = this.expectToken(SyntaxKind.LParen)
const t1 = this.peekToken();
// FIXME should be able to parse tuples
if (t1.kind === SyntaxKind.RParen) {
this.getToken();
return new TupleExpression(lparen, [], t1);
} else {
let rparen;
for (;;) {
const t1 = this.peekToken();
if (t1.kind === SyntaxKind.RParen) {
rparen = t1;
this.getToken();
break;
}
const expression = this.parseExpression();
const t2 = this.expectToken(SyntaxKind.RParen);
return new NestedExpression(lparen, expression, t2);
elements.push(expression);
const t2 = this.getToken();
if (t2.kind === SyntaxKind.Comma) {
continue;
} else if (t2.kind === SyntaxKind.RParen) {
rparen = t2;
break;
} else {
this.raiseParseError(t2, [ SyntaxKind.Comma, SyntaxKind.RParen ]);
}
}
if (elements.length === 1) {
return new NestedExpression(lparen, elements[0], rparen);
}
return new TupleExpression(lparen, elements, rparen);
}
private parsePrimitiveExpression(): Expression {