From b897adccf8b395e99a70652a8252dcf0561f2bb7 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 17 Nov 2018 19:18:54 +0100 Subject: [PATCH] Fix simple expressions not functioning --- Upsilon/Parser/Parser.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Upsilon/Parser/Parser.cs b/Upsilon/Parser/Parser.cs index a1a67fd..d256ba4 100644 --- a/Upsilon/Parser/Parser.cs +++ b/Upsilon/Parser/Parser.cs @@ -296,8 +296,18 @@ namespace Upsilon.Parser { if (!lastCommaFound) break; - var parsed = ParseExpression(); - arrBuilder.Add(parsed); + var parsed = ParseStatement(); + SyntaxNode node; + if (parsed.Kind == SyntaxKind.ExpressionStatement) + node = ((ExpressionStatementSyntax) parsed).Expression; + else if (parsed.Kind == SyntaxKind.AssignmentStatement) + node = parsed; + else + { + //TODO Better error handling + throw new Exception(); + } + arrBuilder.Add(node); lastCommaFound = Current.Kind == SyntaxKind.Comma; if (lastCommaFound) NextToken();