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

Removed toString from expressions

Browse Source
This commit is contained in:
Rafał Grodziński
2025-07-02 17:40:21 +09:00
parent e9d55a2ed1
commit 77b7a7f7c8
20 changed files with 3 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Parser/Expression/Expression.cpp
View File

@@ -15,7 +15,3 @@ ValueType Expression::getValueType() {
bool Expression::isValid() {
return kind != ExpressionKind::INVALID;
}
string Expression::toString(int indent) {
return "EXPRESSION";
}

2
src/Parser/Expression/Expression.h
View File

@@ -28,10 +28,10 @@ protected:
public:
Expression(ExpressionKind kind, ValueType valueType);
virtual ~Expression() { }
ExpressionKind getKind();
ValueType getValueType();
bool isValid();
virtual string toString(int indent);
};
#endif

27
src/Parser/Expression/ExpressionBinary.cpp
View File

@@ -71,30 +71,3 @@ shared_ptr<Expression> ExpressionBinary::getLeft() {
shared_ptr<Expression> ExpressionBinary::getRight() {
return right;
}
string ExpressionBinary::toString(int indent) {
switch (operation) {
case ExpressionBinaryOperation::EQUAL:
return "{= " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::NOT_EQUAL:
return "{!= " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::LESS:
return "{< " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::LESS_EQUAL:
return "{<= " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::GREATER:
return "{> " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::GREATER_EQUAL:
return "{<= " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::ADD:
return "{+ " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::SUB:
return "{- " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::MUL:
return "{* " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::DIV:
return "{/ " + left->toString(0) + " " + right->toString(0) + "}";
case ExpressionBinaryOperation::MOD:
return "{% " + left->toString(0) + " " + right->toString(0) + "}";
}
}

1
src/Parser/Expression/ExpressionBinary.h
View File

@@ -26,5 +26,4 @@ public:
ExpressionBinaryOperation getOperation();
shared_ptr<Expression> getLeft();
shared_ptr<Expression> getRight();
string toString(int indent) override;
};

4
src/Parser/Expression/ExpressionBlock.cpp
View File

@@ -23,7 +23,3 @@ shared_ptr<StatementBlock> ExpressionBlock::getStatementBlock() {
shared_ptr<StatementExpression> ExpressionBlock::getResultStatementExpression() {
return resultStatementExpression;
}
string ExpressionBlock::toString(int indent) {
return "";
}

1
src/Parser/Expression/ExpressionBlock.h
View File

@@ -13,5 +13,4 @@ public:
ExpressionBlock(vector<shared_ptr<Statement>> statements);
shared_ptr<StatementBlock> getStatementBlock();
shared_ptr<StatementExpression> getResultStatementExpression();
string toString(int indent) override;
};

14
src/Parser/Expression/ExpressionCall.cpp
View File

@@ -10,17 +10,3 @@ string ExpressionCall::getName() {
vector<shared_ptr<Expression>> ExpressionCall::getArgumentExpressions() {
return argumentExpressions;
}
string ExpressionCall::toString(int indent) {
string value;
value += "CALL(" + name + "):";
for (shared_ptr<Expression> &argumentExpression : argumentExpressions) {
value += "\n";
for (int ind=0; ind<indent+1; ind++)
value += " ";
value += argumentExpression->toString(indent+1) + ",";
}
return value;
}

1
src/Parser/Expression/ExpressionCall.h
View File

@@ -9,5 +9,4 @@ public:
ExpressionCall(string name, vector<shared_ptr<Expression>> argumentExpressions);
string getName();
vector<shared_ptr<Expression>> getArgumentExpressions();
string toString(int indent) override;
};

4
src/Parser/Expression/ExpressionGrouping.cpp
View File

@@ -6,7 +6,3 @@ Expression(ExpressionKind::GROUPING, expression->getValueType()), expression(exp
shared_ptr<Expression> ExpressionGrouping::getExpression() {
return expression;
}
string ExpressionGrouping::toString(int indent) {
return "( " + expression->toString(0) + " )";
}

1
src/Parser/Expression/ExpressionGrouping.h
View File

@@ -7,5 +7,4 @@ private:
public:
ExpressionGrouping(shared_ptr<Expression> expression);
shared_ptr<Expression> getExpression();
string toString(int indent) override;
};

18
src/Parser/Expression/ExpressionIfElse.cpp
View File

@@ -20,21 +20,3 @@ shared_ptr<ExpressionBlock> ExpressionIfElse::getThenBlock() {
shared_ptr<ExpressionBlock> ExpressionIfElse::getElseBlock() {
return elseBlock;
}
string ExpressionIfElse::toString(int indent) {
string value;
value += "IF(" + condition->toString(0) + "):\n";
value += thenBlock->toString(indent+1);
if (elseBlock != nullptr) {
for (int ind=0; ind<indent; ind++)
value += " ";
value += "ELSE:\n";
value += elseBlock->toString(indent+1);
}
for (int ind=0; ind<indent; ind++)
value += " ";
value += ";";
return value;
}

1
src/Parser/Expression/ExpressionIfElse.h
View File

@@ -13,5 +13,4 @@ public:
shared_ptr<Expression> getCondition();
shared_ptr<ExpressionBlock> getThenBlock();
shared_ptr<ExpressionBlock> getElseBlock();
string toString(int indent) override;
};

4
src/Parser/Expression/ExpressionInvalid.cpp
View File

@@ -7,7 +7,3 @@ Expression(ExpressionKind::INVALID, ValueType::NONE), token(token) {
shared_ptr<Token> ExpressionInvalid::getToken() {
return token;
}
string ExpressionInvalid::toString(int indent) {
return "Invalid token " + token->toString() + " at " + to_string(token->getLine()) + ":" + to_string(token->getColumn()) + "\n";
}

1
src/Parser/Expression/ExpressionInvalid.h
View File

@@ -7,5 +7,4 @@ private:
public:
ExpressionInvalid(shared_ptr<Token> token);
shared_ptr<Token> getToken();
string toString(int indent) override;
};

13
src/Parser/Expression/ExpressionLiteral.cpp
View File

@@ -52,16 +52,3 @@ int32_t ExpressionLiteral::getSint32Value() {
float ExpressionLiteral::getReal32Value() {
return real32Value;
}
string ExpressionLiteral::toString(int indent) {
switch (valueType) {
case ValueType::NONE:
return "NONE";
case ValueType::BOOL:
return boolValue ? "true" : "false";
case ValueType::SINT32:
return to_string(sint32Value);
case ValueType::REAL32:
return to_string(real32Value);
}
}

1
src/Parser/Expression/ExpressionLiteral.h
View File

@@ -13,5 +13,4 @@ public:
bool getBoolValue();
int32_t getSint32Value();
float getReal32Value();
string toString(int indent) override;
};

4
src/Parser/Expression/ExpressionVariable.cpp
View File

@@ -6,7 +6,3 @@ Expression(ExpressionKind::VAR, ValueType::NONE), name(name) { }
string ExpressionVariable::getName() {
return name;
}
string ExpressionVariable::toString(int indent) {
return "VAR(" + name + ")";
}

1
src/Parser/Expression/ExpressionVariable.h
View File

@@ -7,5 +7,4 @@ private:
public:
ExpressionVariable(string name);
string getName();
string toString(int indent) override;
};

2
src/Parser/Parser.cpp
View File

@@ -337,7 +337,7 @@ shared_ptr<Statement> Parser::matchStatementExpression() {
if (expression == nullptr)
return nullptr;
else if (!expression->isValid())
return make_shared<StatementInvalid>(tokens.at(currentIndex), expression->toString(0));
return make_shared<StatementInvalid>(tokens.at(currentIndex), "");// expression->toString(0));
return make_shared<StatementExpression>(expression);
}

2
src/Parser/Statement/Statement.h
View File

@@ -25,7 +25,7 @@ private:
public:
Statement(StatementKind kind);
virtual ~Statement() {}
virtual ~Statement() { }
StatementKind getKind();
bool isValid();
};