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

Pass return value

Browse Source
This commit is contained in:
Rafał Grodziński
2025-06-08 12:13:23 +09:00
parent 53c5e2c22e
commit 88eccac667
4 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ModuleBuilder.cpp
View File

@@ -38,7 +38,7 @@ void ModuleBuilder::buildStatement(shared_ptr<Statement> statement) {
} }
void ModuleBuilder::buildFunctionDeclaration(shared_ptr<StatementFunctionDeclaration> statement) { void ModuleBuilder::buildFunctionDeclaration(shared_ptr<StatementFunctionDeclaration> statement) {
llvm::FunctionType *funType = llvm::FunctionType::get(typeSInt32, false); llvm::FunctionType *funType = llvm::FunctionType::get(typeForValueType(statement->getReturnValueType()), false);
llvm::Function *fun = llvm::Function::Create(funType, llvm::GlobalValue::InternalLinkage, statement->getName(), module.get()); llvm::Function *fun = llvm::Function::Create(funType, llvm::GlobalValue::InternalLinkage, statement->getName(), module.get());
llvm::BasicBlock *block = llvm::BasicBlock::Create(*context, statement->getName(), fun); llvm::BasicBlock *block = llvm::BasicBlock::Create(*context, statement->getName(), fun);
builder->SetInsertPoint(block); builder->SetInsertPoint(block);
@@ -224,7 +224,7 @@ llvm::Value *ModuleBuilder::valueForIfElse(shared_ptr<ExpressionIfElse> expressi
// Merge // Merge
fun->insert(fun->end(), mergeBlock); fun->insert(fun->end(), mergeBlock);
builder->SetInsertPoint(mergeBlock); builder->SetInsertPoint(mergeBlock);
llvm::PHINode *phi = builder->CreatePHI(typeForExpression(expression), valuesCount, "phii"); llvm::PHINode *phi = builder->CreatePHI(typeForValueType(expression->getValueType()), valuesCount, "phii");
phi->addIncoming(thenValue, thenBlock); phi->addIncoming(thenValue, thenBlock);
if (elseValue != nullptr) if (elseValue != nullptr)
phi->addIncoming(elseValue, elseBlock); phi->addIncoming(elseValue, elseBlock);
@@ -233,8 +233,8 @@ llvm::Value *ModuleBuilder::valueForIfElse(shared_ptr<ExpressionIfElse> expressi
return phi; return phi;
} }
llvm::Type *ModuleBuilder::typeForExpression(shared_ptr<Expression> expression) { llvm::Type *ModuleBuilder::typeForValueType(ValueType valueType) {
switch (expression->getValueType()) { switch (valueType) {
case ValueType::VOID: case ValueType::VOID:
return typeVoid; return typeVoid;
case ValueType::BOOL: case ValueType::BOOL:

2
src/ModuleBuilder.h
View File

@@ -40,7 +40,7 @@ private:
llvm::Value *valueForBinaryReal(shared_ptr<ExpressionBinary> expression); llvm::Value *valueForBinaryReal(shared_ptr<ExpressionBinary> expression);
llvm::Value *valueForIfElse(shared_ptr<ExpressionIfElse> expression); llvm::Value *valueForIfElse(shared_ptr<ExpressionIfElse> expression);
llvm::Type *typeForExpression(shared_ptr<Expression> expression); llvm::Type *typeForValueType(ValueType valueType);
public: public:
ModuleBuilder(vector<shared_ptr<Statement>> statements); ModuleBuilder(vector<shared_ptr<Statement>> statements);

16
src/Parser.cpp
View File

@@ -74,13 +74,16 @@ shared_ptr<Statement> Parser::matchStatementBlock() {
else else
statements.push_back(statement); statements.push_back(statement);
} }
currentIndex++; // consune ';' and ':' // consune ';' only
if (tokens.at(currentIndex)->getKind() == TokenKind::SEMICOLON) {
currentIndex++;
if (!tokens.at(currentIndex)->isOfKind({TokenKind::NEW_LINE, TokenKind::END})) if (!tokens.at(currentIndex)->isOfKind({TokenKind::NEW_LINE, TokenKind::END}))
return matchStatementInvalid(); return matchStatementInvalid();
if (tokens.at(currentIndex)->getKind() == TokenKind::NEW_LINE) if (tokens.at(currentIndex)->getKind() == TokenKind::NEW_LINE)
currentIndex++; currentIndex++;
}
return make_shared<StatementBlock>(statements); return make_shared<StatementBlock>(statements);
} }
@@ -95,9 +98,10 @@ shared_ptr<Statement> Parser::matchStatementReturn() {
if (expression != nullptr && !expression->isValid()) if (expression != nullptr && !expression->isValid())
return matchStatementInvalid(); return matchStatementInvalid();
if (tokens.at(currentIndex)->getKind() != TokenKind::NEW_LINE) if (!tokens.at(currentIndex)->isOfKind({TokenKind::NEW_LINE, TokenKind::SEMICOLON}))
return matchStatementInvalid(); return matchStatementInvalid();
if (tokens.at(currentIndex)->getKind() == TokenKind::NEW_LINE)
currentIndex++; // new line currentIndex++; // new line
return make_shared<StatementReturn>(expression); return make_shared<StatementReturn>(expression);
@@ -289,9 +293,11 @@ shared_ptr<Expression> Parser::matchExpressionIfElse() {
// Match else blcok // Match else blcok
shared_ptr<Statement> elseBlock; shared_ptr<Statement> elseBlock;
shared_ptr<Token> lastToken = tokens.at(currentIndex-2); if (tokens.at(currentIndex)->getKind() == TokenKind::COLON) {
// ':' marks else block currentIndex++;
if (lastToken->getKind() == TokenKind::COLON) { if (tokens.at(currentIndex)->getKind() == TokenKind::NEW_LINE)
currentIndex++;
elseBlock = matchStatementBlock(); elseBlock = matchStatementBlock();
if (elseBlock == nullptr) if (elseBlock == nullptr)
return matchExpressionInvalid(); return matchExpressionInvalid();

7
src/Statement.cpp
View File

@@ -98,9 +98,10 @@ string StatementReturn::toString(int indent) {
string value; string value;
for (int ind=0; ind<indent; ind++) for (int ind=0; ind<indent; ind++)
value += " "; value += " ";
value += "RETURN"; value += "RETURN:\n";
if (expression != nullptr) for (int ind=0; ind<indent+1; ind++)
value += "(" + expression->toString(0) + ")"; value += " ";
value += expression->toString(indent+1);
value += "\n"; value += "\n";
return value; return value;
} }