From c0188e16bcd92eeedcbeb01d36f2ff95781db7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Grodzi=C5=84ski?= Date: Tue, 12 Aug 2025 13:11:34 +0900 Subject: [PATCH] Changed naming --- src/Compiler/ModuleBuilder.cpp | 4 ++-- src/Logger.cpp | 4 ++-- src/Parser/Expression/Expression.h | 2 +- src/Parser/Expression/ExpressionVariable.cpp | 8 ++++---- src/Parser/Expression/ExpressionVariable.h | 6 +++--- src/Parser/Parser.cpp | 14 +++++++------- src/Parser/Statement/StatementAssignment.cpp | 14 +++++++------- src/Parser/Statement/StatementAssignment.h | 9 +++++---- 8 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/Compiler/ModuleBuilder.cpp b/src/Compiler/ModuleBuilder.cpp index 2074995..723671e 100644 --- a/src/Compiler/ModuleBuilder.cpp +++ b/src/Compiler/ModuleBuilder.cpp @@ -229,7 +229,7 @@ void ModuleBuilder::buildAssignment(shared_ptr statement) { llvm::Value *value = valueForExpression(statement->getValueExpression()); switch (statement->getAssignmentKind()) { - case StatementAssignmentKind::VARIABLE: { + case StatementAssignmentKind::SIMPLE: { builder->CreateStore(value, alloca); break; } @@ -364,7 +364,7 @@ llvm::Value *ModuleBuilder::valueForExpression(shared_ptr expression return valueForUnary(dynamic_pointer_cast(expression)); case ExpressionKind::IF_ELSE: return valueForIfElse(dynamic_pointer_cast(expression)); - case ExpressionKind::VAR: + case ExpressionKind::VARIABLE: return valueForVariable(dynamic_pointer_cast(expression)); case ExpressionKind::CALL: return valueForCall(dynamic_pointer_cast(expression)); diff --git a/src/Logger.cpp b/src/Logger.cpp index 3e5aeeb..196f552 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -334,7 +334,7 @@ string Logger::toString(shared_ptr statement) { string Logger::toString(shared_ptr statement) { switch (statement->getAssignmentKind()) { - case StatementAssignmentKind::VARIABLE: + case StatementAssignmentKind::SIMPLE: return format("{} <- {}", statement->getIdentifier(), toString(statement->getValueExpression())); case StatementAssignmentKind::DATA: return format("{}[{}] <- {}", statement->getIdentifier(), toString(statement->getIndexExpression()), toString(statement->getValueExpression())); @@ -384,7 +384,7 @@ string Logger::toString(shared_ptr expression) { return toString(dynamic_pointer_cast(expression)); case ExpressionKind::IF_ELSE: return toString(dynamic_pointer_cast(expression)); - case ExpressionKind::VAR: + case ExpressionKind::VARIABLE: return toString(dynamic_pointer_cast(expression)); case ExpressionKind::GROUPING: return toString(dynamic_pointer_cast(expression)); diff --git a/src/Parser/Expression/Expression.h b/src/Parser/Expression/Expression.h index a335052..9fc4f46 100644 --- a/src/Parser/Expression/Expression.h +++ b/src/Parser/Expression/Expression.h @@ -15,7 +15,7 @@ enum class ExpressionKind { UNARY, BINARY, IF_ELSE, - VAR, + VARIABLE, CALL, BLOCK }; diff --git a/src/Parser/Expression/ExpressionVariable.cpp b/src/Parser/Expression/ExpressionVariable.cpp index 6bb7423..242fa89 100644 --- a/src/Parser/Expression/ExpressionVariable.cpp +++ b/src/Parser/Expression/ExpressionVariable.cpp @@ -1,13 +1,13 @@ #include "ExpressionVariable.h" -shared_ptr ExpressionVariable::simpleVariable(string identifier) { +shared_ptr ExpressionVariable::simple(string identifier) { shared_ptr expression = make_shared(); expression->variableKind = ExpressionVariableKind::SIMPLE; expression->identifier = identifier; return expression; } -shared_ptr ExpressionVariable::dataVariable(string identifier, shared_ptr indexExpression) { +shared_ptr ExpressionVariable::data(string identifier, shared_ptr indexExpression) { shared_ptr expression = make_shared(); expression->variableKind = ExpressionVariableKind::DATA; expression->identifier = identifier; @@ -15,7 +15,7 @@ shared_ptr ExpressionVariable::dataVariable(string identifie return expression; } -shared_ptr ExpressionVariable::blobVariable(string identifier, string memberName) { +shared_ptr ExpressionVariable::blob(string identifier, string memberName) { shared_ptr expression = make_shared(); expression->variableKind = ExpressionVariableKind::BLOB; expression->identifier = identifier; @@ -24,7 +24,7 @@ shared_ptr ExpressionVariable::blobVariable(string identifie } ExpressionVariable::ExpressionVariable(): -Expression(ExpressionKind::VAR, nullptr) { } +Expression(ExpressionKind::VARIABLE, nullptr) { } ExpressionVariableKind ExpressionVariable::getVariableKind() { return variableKind; diff --git a/src/Parser/Expression/ExpressionVariable.h b/src/Parser/Expression/ExpressionVariable.h index 7a1f255..99c9868 100644 --- a/src/Parser/Expression/ExpressionVariable.h +++ b/src/Parser/Expression/ExpressionVariable.h @@ -14,9 +14,9 @@ private: string memberName; public: - static shared_ptr simpleVariable(string identifer); - static shared_ptr dataVariable(string identifier, shared_ptr indexExpression); - static shared_ptr blobVariable(string identifier, string memberName); + static shared_ptr simple(string identifer); + static shared_ptr data(string identifier, shared_ptr indexExpression); + static shared_ptr blob(string identifier, string memberName); ExpressionVariable(); ExpressionVariableKind getVariableKind(); diff --git a/src/Parser/Parser.cpp b/src/Parser/Parser.cpp index f67480e..2720985 100644 --- a/src/Parser/Parser.cpp +++ b/src/Parser/Parser.cpp @@ -495,7 +495,7 @@ shared_ptr Parser::matchStatementAssignment() { case ParseeResultsGroupKind::SUCCESS: { string identifier = resultsGroup.getResults().at(0).getToken()->getLexme(); shared_ptr valueExpression = resultsGroup.getResults().at(1).getExpression(); - return StatementAssignment::variableAssignment(identifier, valueExpression); + return StatementAssignment::simple(identifier, valueExpression); } case ParseeResultsGroupKind::NO_MATCH: break; @@ -525,7 +525,7 @@ shared_ptr Parser::matchStatementAssignment() { string identifier = resultsGroup.getResults().at(0).getToken()->getLexme(); shared_ptr indexExpression = resultsGroup.getResults().at(1).getExpression(); shared_ptr valueExpression = resultsGroup.getResults().at(2).getExpression(); - return StatementAssignment::dataAssignment(identifier, indexExpression, valueExpression); + return StatementAssignment::data(identifier, indexExpression, valueExpression); } case ParseeResultsGroupKind::NO_MATCH: break; @@ -554,7 +554,7 @@ shared_ptr Parser::matchStatementAssignment() { string identifier = resultsGroup.getResults().at(0).getToken()->getLexme(); string memberName = resultsGroup.getResults().at(1).getToken()->getLexme(); shared_ptr valueExpression = resultsGroup.getResults().at(2).getExpression(); - return StatementAssignment::blobAssignment(identifier, memberName, valueExpression); + return StatementAssignment::blob(identifier, memberName, valueExpression); } case ParseeResultsGroupKind::NO_MATCH: break; @@ -832,8 +832,8 @@ shared_ptr Parser::matchExpressionVariable() { switch (resultsGroup.getKind()) { case ParseeResultsGroupKind::SUCCESS: { string identifier = resultsGroup.getResults().at(0).getToken()->getLexme(); - shared_ptr indexExpression = indexExpression = resultsGroup.getResults().at(1).getExpression(); - return ExpressionVariable::dataVariable(identifier, indexExpression); + shared_ptr indexExpression = resultsGroup.getResults().at(1).getExpression(); + return ExpressionVariable::data(identifier, indexExpression); } case ParseeResultsGroupKind::NO_MATCH: break; @@ -858,7 +858,7 @@ shared_ptr Parser::matchExpressionVariable() { case ParseeResultsGroupKind::SUCCESS: { string identifier = resultsGroup.getResults().at(0).getToken()->getLexme(); string memberName = resultsGroup.getResults().at(1).getToken()->getLexme(); - return ExpressionVariable::blobVariable(identifier, memberName); + return ExpressionVariable::blob(identifier, memberName); } case ParseeResultsGroupKind::NO_MATCH: break; @@ -879,7 +879,7 @@ shared_ptr Parser::matchExpressionVariable() { switch (resultsGroup.getKind()) { case ParseeResultsGroupKind::SUCCESS: { string identifier = resultsGroup.getResults().at(0).getToken()->getLexme(); - return ExpressionVariable::simpleVariable(identifier); + return ExpressionVariable::simple(identifier); } case ParseeResultsGroupKind::NO_MATCH: break; diff --git a/src/Parser/Statement/StatementAssignment.cpp b/src/Parser/Statement/StatementAssignment.cpp index 51722a7..5dfeee0 100644 --- a/src/Parser/Statement/StatementAssignment.cpp +++ b/src/Parser/Statement/StatementAssignment.cpp @@ -1,17 +1,14 @@ #include "StatementAssignment.h" -StatementAssignment::StatementAssignment(): -Statement(StatementKind::ASSIGNMENT) { } - -shared_ptr StatementAssignment::variableAssignment(string identifier, shared_ptr valueExpression) { +shared_ptr StatementAssignment::simple(string identifier, shared_ptr valueExpression) { shared_ptr statement = make_shared(); - statement->assignmentKind = StatementAssignmentKind::VARIABLE; + statement->assignmentKind = StatementAssignmentKind::SIMPLE; statement->identifier = identifier; statement->valueExpression = valueExpression; return statement; } -shared_ptr StatementAssignment::dataAssignment(string identifier, shared_ptr indexExpression, shared_ptr valueExpression) { +shared_ptr StatementAssignment::data(string identifier, shared_ptr indexExpression, shared_ptr valueExpression) { shared_ptr statement = make_shared(); statement->assignmentKind = StatementAssignmentKind::DATA; statement->identifier = identifier; @@ -20,7 +17,7 @@ shared_ptr StatementAssignment::dataAssignment(string ident return statement; } -shared_ptr StatementAssignment::blobAssignment(string identifier, string memberName, shared_ptr valueExpression) { +shared_ptr StatementAssignment::blob(string identifier, string memberName, shared_ptr valueExpression) { shared_ptr statement = make_shared(); statement->assignmentKind = StatementAssignmentKind::BLOB; statement->identifier = identifier; @@ -29,6 +26,9 @@ shared_ptr StatementAssignment::blobAssignment(string ident return statement; } +StatementAssignment::StatementAssignment(): +Statement(StatementKind::ASSIGNMENT) { } + StatementAssignmentKind StatementAssignment::getAssignmentKind() { return assignmentKind; } diff --git a/src/Parser/Statement/StatementAssignment.h b/src/Parser/Statement/StatementAssignment.h index 110ee4c..9b639ca 100644 --- a/src/Parser/Statement/StatementAssignment.h +++ b/src/Parser/Statement/StatementAssignment.h @@ -3,7 +3,7 @@ class Expression; enum class StatementAssignmentKind { - VARIABLE, + SIMPLE, DATA, BLOB }; @@ -17,10 +17,11 @@ private: shared_ptr valueExpression; public: + static shared_ptr simple(string identifier, shared_ptr valueExpression); + static shared_ptr data(string identifier, shared_ptr indexExpression, shared_ptr valueExpression); + static shared_ptr blob(string identifier, string memberName, shared_ptr valueExpression); + StatementAssignment(); - static shared_ptr variableAssignment(string identifier, shared_ptr valueExpression); - static shared_ptr dataAssignment(string identifier, shared_ptr indexExpression, shared_ptr valueExpression); - static shared_ptr blobAssignment(string identifier, string memberName, shared_ptr valueExpression); StatementAssignmentKind getAssignmentKind(); string getIdentifier(); shared_ptr getIndexExpression();