Deukhoofd/Upsilon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes issue where functions inside binary operators wouldnt work

Browse Source
This commit is contained in:
Deukhoofd
2018-11-24 12:55:51 +01:00
parent 62a18e22d4
commit 9be1cfa1fc
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Upsilon/Parser/Parser.cs
View File

@@ -268,17 +268,24 @@ namespace Upsilon.Parser
{
expression = ParseBinaryExpression();
}
HandleComplexExpression(expression);
return expression;
}
private ExpressionSyntax HandleComplexExpression(ExpressionSyntax baseExpression)
{
while (Current.Kind == SyntaxKind.OpenBracket || Current.Kind == SyntaxKind.OpenParenthesis ||
Current.Kind == SyntaxKind.FullStop)
{
if (Current.Kind == SyntaxKind.OpenBracket)
expression = ParseIndexExpression(expression);
baseExpression = ParseIndexExpression(baseExpression);
else if (Current.Kind == SyntaxKind.OpenParenthesis)
expression = ParseFunctionCallExpression(expression);
baseExpression = ParseFunctionCallExpression(baseExpression);
else if (Current.Kind == SyntaxKind.FullStop)
expression = ParseFullStopIndexExpression(expression);
baseExpression = ParseFullStopIndexExpression(baseExpression);
}
return expression;
return baseExpression;
}
private StatementSyntax ParseAssignmentExpression()
@@ -346,6 +353,7 @@ namespace Upsilon.Parser
var op = NextToken();
var right = ParseBinaryExpression(precedence);
right = HandleComplexExpression(right);
left = new BinaryExpressionSyntax(left, op, right);
}
return left;