Implements return statement

src/Parser/ParsedStatements/ParsedStatement.hpp

@@ -15,7 +15,8 @@ enum class ParsedStatementKind{
     Block,
     Expression,
     Assignment,
-    FunctionDeclaration
+    FunctionDeclaration,
+    Return
 };
 
 class ParsedStatement {
@@ -166,4 +167,24 @@ public:
     }
 };
 
+class ParsedReturnStatement : public ParsedStatement{
+    ParsedExpression* _expression;
+public:
+    ParsedReturnStatement(ParsedExpression* expression, unsigned int start, unsigned int length) : ParsedStatement(start, length){
+        _expression = expression;
+    }
+
+    ~ParsedReturnStatement() final{
+        delete _expression;
+    }
+
+    ParsedStatementKind GetKind() final{
+        return ParsedStatementKind ::Return;
+    }
+
+    ParsedExpression* GetExpression(){
+        return _expression;
+    }
+};
+
 #endif //PORYGONLANG_PARSEDSTATEMENT_HPP

src/Parser/Parser.cpp

@@ -33,6 +33,7 @@ ParsedStatement* Parser::ParseStatement(IToken* current){
     switch (currentKind){
         case TokenKind ::LocalKeyword: return this -> ParseAssignment(current);
         case TokenKind ::FunctionKeyword: return this -> ParseFunctionDeclaration(current);
+        case TokenKind ::ReturnKeyword: return this->ParseReturnStatement(current);
         default: break;
     }
     if (this->Peek()->GetKind() == TokenKind::AssignmentToken){
@@ -134,7 +135,13 @@ ParsedStatement *Parser::ParseFunctionDeclaration(IToken *current) {
     }
     auto functionIdentifier = ((IdentifierToken*) functionIdentifierToken)->Value;
     return new ParsedFunctionDeclarationStatement(HashedString(functionIdentifier), parameters, (ParsedBlockStatement*)block, start, block->GetEndPosition() - start);
+}
 
+ParsedStatement* Parser::ParseReturnStatement(IToken* current){
+    //TODO: if next token is on a different line, don't parse it as return expression.
+    auto expression = this->ParseExpression(this->Next());
+    auto start = current->GetStartPosition();
+    return new ParsedReturnStatement(expression, start, expression->GetEndPosition() - start);
 }
 
 ParsedExpression* Parser::ParseExpression(IToken* current){

src/Parser/Parser.hpp

@@ -29,6 +29,7 @@ class Parser {
     ParsedStatement* ParseAssignment(IToken* current);
     ParsedStatement *ParseBlock(const vector<TokenKind>& endTokens);
     ParsedStatement* ParseFunctionDeclaration(IToken* current);
+    ParsedStatement *ParseReturnStatement(IToken *current);
 
     ParsedExpression* ParseExpression(IToken* current);
     ParsedExpression* ParseBinaryExpression(IToken* current, OperatorPrecedence parentPrecedence);