CarGDev/bits-runner-builder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up function definition a bit

Browse Source
This commit is contained in:
Rafał Grodziński
2025-06-30 23:51:48 +09:00
parent f4cde21a0a
commit cac252a0de
2 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/Parser/Parser.cpp
View File

@@ -52,21 +52,21 @@ shared_ptr<Statement> Parser::nextStatement() {
if (statement != nullptr) if (statement != nullptr)
return statement; return statement;
statement = matchStatementAssignment(); /*statement = matchStatementAssignment();
if (statement != nullptr) if (statement != nullptr)
return statement; return statement;*/
statement = matchStatementReturn(); /*statement = matchStatementReturn();
if (statement != nullptr) if (statement != nullptr)
return statement; return statement;*/
statement = matchStatementLoop(); /*statement = matchStatementLoop();
if (statement != nullptr) if (statement != nullptr)
return statement; return statement;*/
statement = matchStatementExpression(); /*statement = matchStatementExpression();
if (statement != nullptr) if (statement != nullptr)
return statement; return statement;*/
statement = matchStatementMetaExternFunction(); statement = matchStatementMetaExternFunction();
if (statement != nullptr) if (statement != nullptr)
@@ -79,21 +79,23 @@ shared_ptr<Statement> Parser::matchStatementFunction() {
if (!tryMatchingTokenKinds({TokenKind::IDENTIFIER, TokenKind::FUNCTION}, true, false)) if (!tryMatchingTokenKinds({TokenKind::IDENTIFIER, TokenKind::FUNCTION}, true, false))
return nullptr; return nullptr;
shared_ptr<Token> identifierToken = tokens.at(currentIndex); string name;
currentIndex++; vector<pair<string, ValueType>> arguments;
ValueType returnType = ValueType::NONE;
shared_ptr<Statement> statementBlock;
// name
name = tokens.at(currentIndex++)->getLexme();
currentIndex++; // skip fun currentIndex++; // skip fun
// Get arguments // arguments
vector<pair<string, ValueType>> arguments;
if (tryMatchingTokenKinds({TokenKind::COLON}, true, true)) { if (tryMatchingTokenKinds({TokenKind::COLON}, true, true)) {
do { do {
tryMatchingTokenKinds({TokenKind::NEW_LINE}, true, true); // skip new line tryMatchingTokenKinds({TokenKind::NEW_LINE}, true, true); // skip new line
if (!tryMatchingTokenKinds({TokenKind::IDENTIFIER, TokenKind::TYPE}, true, false)) if (!tryMatchingTokenKinds({TokenKind::IDENTIFIER, TokenKind::TYPE}, true, false))
return matchStatementInvalid("Expected function argument"); return matchStatementInvalid("Expected function argument");
shared_ptr<Token> identifierToken = tokens.at(currentIndex); shared_ptr<Token> identifierToken = tokens.at(currentIndex++);
currentIndex++; // identifier shared_ptr<Token> typeToken = tokens.at(currentIndex++);
shared_ptr<Token> typeToken = tokens.at(currentIndex);
currentIndex++; // type
optional<ValueType> argumentType = valueTypeForToken(typeToken); optional<ValueType> argumentType = valueTypeForToken(typeToken);
if (!argumentType) if (!argumentType)
return matchStatementInvalid("Invalid argument type"); return matchStatementInvalid("Invalid argument type");
@@ -102,12 +104,10 @@ shared_ptr<Statement> Parser::matchStatementFunction() {
} while (tryMatchingTokenKinds({TokenKind::COMMA}, true, true)); } while (tryMatchingTokenKinds({TokenKind::COMMA}, true, true));
} }
// consume optional new line // return type
tryMatchingTokenKinds({TokenKind::NEW_LINE}, true, true);
// Return type
ValueType returnType = ValueType::NONE;
if (tryMatchingTokenKinds({TokenKind::RIGHT_ARROW}, true, true)) { if (tryMatchingTokenKinds({TokenKind::RIGHT_ARROW}, true, true)) {
tryMatchingTokenKinds({TokenKind::NEW_LINE}, true, true); // skip new line
shared_ptr<Token> typeToken = tokens.at(currentIndex); shared_ptr<Token> typeToken = tokens.at(currentIndex);
optional<ValueType> type = valueTypeForToken(typeToken); optional<ValueType> type = valueTypeForToken(typeToken);
if (!type) if (!type)
@@ -121,16 +121,15 @@ shared_ptr<Statement> Parser::matchStatementFunction() {
return matchStatementInvalid("Expected new line after function declaration"); return matchStatementInvalid("Expected new line after function declaration");
} }
shared_ptr<Statement> statementBlock = matchStatementBlock({TokenKind::SEMICOLON}, true); // block
if (statementBlock == nullptr) statementBlock = matchStatementBlock({TokenKind::SEMICOLON});
return matchStatementInvalid(); if (statementBlock == nullptr || !statementBlock->isValid())
else if (!statementBlock->isValid()) return statementBlock ?: matchStatementInvalid();
return statementBlock;
if(!tryMatchingTokenKinds({TokenKind::NEW_LINE}, false, true)) if(!tryMatchingTokenKinds({TokenKind::SEMICOLON}, false, true))
return matchStatementInvalid("Expected a new line after a function declaration"); return matchStatementInvalid("Expected a \";\" after a function declaration");
return make_shared<StatementFunction>(identifierToken->getLexme(), arguments, returnType, dynamic_pointer_cast<StatementBlock>(statementBlock)); return make_shared<StatementFunction>(name, arguments, returnType, dynamic_pointer_cast<StatementBlock>(statementBlock));
} }
shared_ptr<Statement> Parser::matchStatementVariable() { shared_ptr<Statement> Parser::matchStatementVariable() {
@@ -243,7 +242,7 @@ shared_ptr<Statement> Parser::matchStatementLoop() {
} }
// body // body
shared_ptr<Statement> bodyBlockStatement = matchStatementBlock({TokenKind::SEMICOLON}, true); shared_ptr<Statement> bodyBlockStatement = matchStatementBlock({TokenKind::SEMICOLON});
if (bodyBlockStatement == nullptr) if (bodyBlockStatement == nullptr)
return matchStatementInvalid("Expected block statement"); return matchStatementInvalid("Expected block statement");
else if (!bodyBlockStatement->isValid()) else if (!bodyBlockStatement->isValid())
@@ -320,21 +319,14 @@ shared_ptr<Statement> Parser::matchStatementMetaExternFunction() {
return make_shared<StatementMetaExternFunction>(identifierToken->getLexme(), arguments, returnType); return make_shared<StatementMetaExternFunction>(identifierToken->getLexme(), arguments, returnType);
} }
shared_ptr<Statement> Parser::matchStatementBlock(vector<TokenKind> terminalTokenKinds, bool shouldConsumeTerminal) { shared_ptr<Statement> Parser::matchStatementBlock(vector<TokenKind> terminalTokenKinds) {
vector<shared_ptr<Statement>> statements; vector<shared_ptr<Statement>> statements;
bool hasNewLineTerminal = find(terminalTokenKinds.begin(), terminalTokenKinds.end(), TokenKind::NEW_LINE) != terminalTokenKinds.end(); while (!tryMatchingTokenKinds(terminalTokenKinds, false, false)) {
while (!tryMatchingTokenKinds(terminalTokenKinds, false, shouldConsumeTerminal)) {
shared_ptr<Statement> statement = nextStatement(); shared_ptr<Statement> statement = nextStatement();
if (statement == nullptr) if (statement == nullptr || !statement->isValid())
return matchStatementInvalid(); return statement ?: matchStatementInvalid("Expected statement");
else if (!statement->isValid()) statements.push_back(statement);
return statement;
else
statements.push_back(statement);
if (hasNewLineTerminal && tokens.at(currentIndex-1)->getKind() == TokenKind::NEW_LINE)
currentIndex--;
} }
return make_shared<StatementBlock>(statements); return make_shared<StatementBlock>(statements);
@@ -572,8 +564,7 @@ shared_ptr<Expression> Parser::matchExpressionBlock(vector<TokenKind> terminalTo
shared_ptr<Statement> statement = nextStatement(); shared_ptr<Statement> statement = nextStatement();
if (statement == nullptr || !statement->isValid()) if (statement == nullptr || !statement->isValid())
return matchExpressionInvalid("Expected statement"); return matchExpressionInvalid("Expected statement");
else statements.push_back(statement);
statements.push_back(statement);
} }
return make_shared<ExpressionBlock>(statements); return make_shared<ExpressionBlock>(statements);

2
src/Parser/Parser.h
View File

@@ -26,7 +26,7 @@ private:
shared_ptr<Statement> matchStatementLoop(); shared_ptr<Statement> matchStatementLoop();
shared_ptr<Statement> matchStatementExpression(); shared_ptr<Statement> matchStatementExpression();
shared_ptr<Statement> matchStatementMetaExternFunction(); shared_ptr<Statement> matchStatementMetaExternFunction();
shared_ptr<Statement> matchStatementBlock(vector<TokenKind> terminalTokenKinds, bool shouldConsumeTerminal); shared_ptr<Statement> matchStatementBlock(vector<TokenKind> terminalTokenKinds);
shared_ptr<StatementInvalid> matchStatementInvalid(string message = ""); shared_ptr<StatementInvalid> matchStatementInvalid(string message = "");
shared_ptr<Expression> nextExpression(); shared_ptr<Expression> nextExpression();