From 5e65c66d3a56a4475f723e762be92041615cf656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Grodzi=C5=84ski?= Date: Tue, 5 Aug 2025 12:45:44 +0900 Subject: [PATCH] Renamed to blob --- src/Compiler/ModuleBuilder.cpp | 8 ++++---- src/Compiler/ModuleBuilder.h | 4 ++-- src/Logger.cpp | 10 +++++----- src/Logger.h | 4 ++-- src/Parser/Parser.cpp | 8 ++++---- src/Parser/Parser.h | 2 +- src/Parser/Statement/Statement.h | 2 +- src/Parser/Statement/StatementBlob.cpp | 14 ++++++++++++++ .../Statement/{StatementType.h => StatementBlob.h} | 5 ++--- src/Parser/Statement/StatementType.cpp | 14 -------------- 10 files changed, 35 insertions(+), 36 deletions(-) create mode 100644 src/Parser/Statement/StatementBlob.cpp rename src/Parser/Statement/{StatementType.h => StatementBlob.h} (71%) delete mode 100644 src/Parser/Statement/StatementType.cpp diff --git a/src/Compiler/ModuleBuilder.cpp b/src/Compiler/ModuleBuilder.cpp index 1f877e8..18008d0 100644 --- a/src/Compiler/ModuleBuilder.cpp +++ b/src/Compiler/ModuleBuilder.cpp @@ -16,7 +16,7 @@ #include "Parser/Statement/StatementFunction.h" #include "Parser/Statement/StatementRawFunction.h" -#include "Parser/Statement/StatementType.h" +#include "Parser/Statement/StatementBlob.h" #include "Parser/Statement/StatementVariable.h" #include "Parser/Statement/StatementAssignment.h" #include "Parser/Statement/StatementReturn.h" @@ -69,8 +69,8 @@ void ModuleBuilder::buildStatement(shared_ptr statement) { case StatementKind::RAW_FUNCTION: buildRawFunction(dynamic_pointer_cast(statement)); break; - case StatementKind::TYPE: - buildType(dynamic_pointer_cast(statement)); + case StatementKind::BLOB: + buildType(dynamic_pointer_cast(statement)); break; case StatementKind::VARIABLE: buildVarDeclaration(dynamic_pointer_cast(statement)); @@ -164,7 +164,7 @@ void ModuleBuilder::buildRawFunction(shared_ptr statement) return; } -void ModuleBuilder::buildType(shared_ptr statement) { +void ModuleBuilder::buildType(shared_ptr statement) { llvm::StructType *structType = llvm::StructType::create(*context, statement->getIdentifier()); vector elements; structType->setBody(elements, false); diff --git a/src/Compiler/ModuleBuilder.h b/src/Compiler/ModuleBuilder.h index 71dcd9c..fef55a3 100644 --- a/src/Compiler/ModuleBuilder.h +++ b/src/Compiler/ModuleBuilder.h @@ -29,7 +29,7 @@ enum class ExpressionBinaryOperation; class Statement; class StatementFunction; class StatementRawFunction; -class StatementType; +class StatementBlob; class StatementVariable; class StatementAssignment; class StatementReturn; @@ -71,7 +71,7 @@ private: void buildStatement(shared_ptr statement); void buildFunction(shared_ptr statement); void buildRawFunction(shared_ptr statement); - void buildType(shared_ptr statement); + void buildType(shared_ptr statement); void buildVarDeclaration(shared_ptr statement); void buildAssignment(shared_ptr statement); void buildBlock(shared_ptr statement); diff --git a/src/Logger.cpp b/src/Logger.cpp index 9747083..6ea6f3f 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -12,7 +12,7 @@ #include "Parser/Statement/StatementVariable.h" #include "Parser/Statement/StatementFunction.h" #include "Parser/Statement/StatementRawFunction.h" -#include "Parser/Statement/StatementType.h" +#include "Parser/Statement/StatementBlob.h" #include "Parser/Statement/StatementBlock.h" #include "Parser/Statement/StatementAssignment.h" #include "Parser/Statement/StatementReturn.h" @@ -241,8 +241,8 @@ string Logger::toString(shared_ptr statement) { return toString(dynamic_pointer_cast(statement)); case StatementKind::RAW_FUNCTION: return toString(dynamic_pointer_cast(statement)); - case StatementKind::TYPE: - return toString(dynamic_pointer_cast(statement)); + case StatementKind::BLOB: + return toString(dynamic_pointer_cast(statement)); case StatementKind::BLOCK: return toString(dynamic_pointer_cast(statement)); case StatementKind::ASSIGNMENT: @@ -303,10 +303,10 @@ string Logger::toString(shared_ptr statement) { return text; } -string Logger::toString(shared_ptr statement) { +string Logger::toString(shared_ptr statement) { string text; - text += format("TYPE(\"{}\"):\n", statement->getIdentifier()); + text += format("BLOB(\"{}\"):\n", statement->getIdentifier()); return text; } diff --git a/src/Logger.h b/src/Logger.h index 81521a9..5ebcd86 100644 --- a/src/Logger.h +++ b/src/Logger.h @@ -12,7 +12,7 @@ class StatementMetaExternFunction; class StatementVariable; class StatementFunction; class StatementRawFunction; -class StatementType; +class StatementBlob; class StatementBlock; class StatementAssignment; class StatementReturn; @@ -45,7 +45,7 @@ private: static string toString(shared_ptr statement); static string toString(shared_ptr statement); static string toString(shared_ptr statement); - static string toString(shared_ptr statement); + static string toString(shared_ptr statement); static string toString(shared_ptr statement); static string toString(shared_ptr statement); static string toString(shared_ptr statement); diff --git a/src/Parser/Parser.cpp b/src/Parser/Parser.cpp index 4bcacba..21fdc61 100644 --- a/src/Parser/Parser.cpp +++ b/src/Parser/Parser.cpp @@ -18,7 +18,7 @@ #include "Parser/Statement/StatementFunction.h" #include "Parser/Statement/StatementRawFunction.h" -#include "Parser/Statement/StatementType.h" +#include "Parser/Statement/StatementBlob.h" #include "Parser/Statement/StatementVariable.h" #include "Parser/Statement/StatementAssignment.h" #include "Parser/Statement/StatementReturn.h" @@ -81,7 +81,7 @@ shared_ptr Parser::nextStatement() { if (statement != nullptr || errors.size() > errorsCount) return statement; - statement = matchStatementType(); + statement = matchStatementBlob(); if (statement != nullptr || errors.size() > errorsCount) return statement; @@ -491,7 +491,7 @@ shared_ptr Parser::matchStatementRawFunction() { return make_shared(name, constraints, arguments, returnType, rawSource); } -shared_ptr Parser::matchStatementType() { +shared_ptr Parser::matchStatementBlob() { ParseeResultsGroup resultsGroup; string identifier; @@ -535,7 +535,7 @@ shared_ptr Parser::matchStatementType() { return nullptr; } - return make_shared(identifier, variables); + return make_shared(identifier, variables); } shared_ptr Parser::matchStatementBlock(vector terminalTokenKinds) { diff --git a/src/Parser/Parser.h b/src/Parser/Parser.h index 3116875..bd1dea2 100644 --- a/src/Parser/Parser.h +++ b/src/Parser/Parser.h @@ -31,7 +31,7 @@ private: shared_ptr matchStatementVariable(); shared_ptr matchStatementFunction(); shared_ptr matchStatementRawFunction(); - shared_ptr matchStatementType(); + shared_ptr matchStatementBlob(); shared_ptr matchStatementBlock(vector terminalTokenKinds); shared_ptr matchStatementAssignment(); diff --git a/src/Parser/Statement/Statement.h b/src/Parser/Statement/Statement.h index 578bed3..e13b25a 100644 --- a/src/Parser/Statement/Statement.h +++ b/src/Parser/Statement/Statement.h @@ -15,7 +15,7 @@ enum class StatementKind { ASSIGNMENT, REPEAT, META_EXTERN_FUNCTION, - TYPE + BLOB }; class Statement { diff --git a/src/Parser/Statement/StatementBlob.cpp b/src/Parser/Statement/StatementBlob.cpp new file mode 100644 index 0000000..c0a9479 --- /dev/null +++ b/src/Parser/Statement/StatementBlob.cpp @@ -0,0 +1,14 @@ +#include "StatementBlob.h" + +#include "Parser/ValueType.h" + +StatementBlob::StatementBlob(string identifier, vector>> variables): +Statement(StatementKind::BLOB), identifier(identifier), variables(variables) { } + +string StatementBlob::getIdentifier() { + return identifier; +} + +vector>> StatementBlob::getVariables() { + return variables; +} \ No newline at end of file diff --git a/src/Parser/Statement/StatementType.h b/src/Parser/Statement/StatementBlob.h similarity index 71% rename from src/Parser/Statement/StatementType.h rename to src/Parser/Statement/StatementBlob.h index 5e3e242..2f1851b 100644 --- a/src/Parser/Statement/StatementType.h +++ b/src/Parser/Statement/StatementBlob.h @@ -3,16 +3,15 @@ #include "Statement.h" -class StatementVariable; class ValueType; -class StatementType: public Statement { +class StatementBlob: public Statement { private: string identifier; vector>> variables; public: - StatementType(string identifier, vector>> variables); + StatementBlob(string identifier, vector>> variables); string getIdentifier(); vector>> getVariables(); }; diff --git a/src/Parser/Statement/StatementType.cpp b/src/Parser/Statement/StatementType.cpp deleted file mode 100644 index 184b5a7..0000000 --- a/src/Parser/Statement/StatementType.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "StatementType.h" - -#include "Parser/ValueType.h" - -StatementType::StatementType(string identifier, vector>> variables): -Statement(StatementKind::TYPE), identifier(identifier), variables(variables) { } - -string StatementType::getIdentifier() { - return identifier; -} - -vector>> StatementType::getVariables() { - return variables; -} \ No newline at end of file