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

Handle empty return statements

This commit is contained in:
Deukhoofd 2018-11-28 14:13:39 +01:00
parent cc029d0689
commit cefe48cb4b
No known key found for this signature in database
GPG Key ID: B4C087AC81641654
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Upsilon/Binder/Binder.cs
View File

@ -509,8 +509,11 @@ namespace Upsilon.Binder
private BoundStatement BindReturnStatement(ReturnStatementSyntax e) private BoundStatement BindReturnStatement(ReturnStatementSyntax e)
{ {
if (e.Expression == null)
return new BoundReturnStatement(null, e.Span);
var expression = BindExpression(e.Expression); var expression = BindExpression(e.Expression);
if (expression.Type != Type.Unknown && expression.Type != Type.Unknown && if (expression.Type != Type.Unknown && expression.Type != Type.Unknown &&
Scope.ReturnType != Type.Unknown && Scope.ReturnType != Type.Nil) Scope.ReturnType != Type.Unknown && Scope.ReturnType != Type.Nil)
{ {
if (expression.Type != Scope.ReturnType) if (expression.Type != Scope.ReturnType)

2
Upsilon/Evaluator/Evaluator.cs
View File

@ -423,7 +423,7 @@ namespace Upsilon.Evaluator
private void EvaluateReturnStatement(BoundReturnStatement b) private void EvaluateReturnStatement(BoundReturnStatement b)
{ {
_returnValue = EvaluateExpression(b.Expression); _returnValue = b.Expression == null ? null : EvaluateExpression(b.Expression);
_lastValue = _returnValue; _lastValue = _returnValue;
HasReturned = true; HasReturned = true;
} }

4
Upsilon/Parser/Parser.cs
View File

@ -283,7 +283,9 @@ namespace Upsilon.Parser
private StatementSyntax ParseReturnStatement() private StatementSyntax ParseReturnStatement()
{ {
var returnToken = MatchToken(SyntaxKind.ReturnKeyword); var returnToken = MatchToken(SyntaxKind.ReturnKeyword);
var expression = ParseExpression(); ExpressionSyntax expression = null;
if (Current.Kind != SyntaxKind.EndKeyword)
expression = ParseExpression();
return new ReturnStatementSyntax(returnToken, expression); return new ReturnStatementSyntax(returnToken, expression);
} }

4
Upsilon/Parser/StatementSyntax/ReturnStatementSyntax.cs
View File

@ -9,7 +9,9 @@ namespace Upsilon.Parser
{ {
ReturnToken = returnToken; ReturnToken = returnToken;
Expression = expression; Expression = expression;
Span = new TextSpan(returnToken.Span.Start, expression.Span.End - returnToken.Span.Start); var end = returnToken.Span.End;
if (expression != null) end = expression.Span.End;
Span = new TextSpan(returnToken.Span.Start, end - returnToken.Span.Start);
} }
public SyntaxToken ReturnToken { get; } public SyntaxToken ReturnToken { get; }