jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 06:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow filter string error to be translated

Browse source
This commit is contained in:
ebbit1q 2024-12-21 14:48:58 +01:00
parent 6ea333d0f1
commit c529f20a92
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cockatrice/src/game/filters/filter_string.cpp
View file

@ -364,6 +364,15 @@ FilterString::FilterString()
_error = "Not initialized";
}
void FilterString::logger(size_t ln, size_t col, const std::string &msg) {
if(ln == 0) {
_error = tr("Error at position %1: %2").arg(col).arg(QString::fromStdString(msg));
}else{
_error = tr("Error at line %1, position %2: %3").arg(ln).arg(col).arg(QString::fromStdString(msg));
}
}
FilterString::FilterString(const QString &expr)
{
QByteArray ba = expr.simplified().toUtf8();
@ -377,9 +386,7 @@ FilterString::FilterString(const QString &expr)
return;
}
search.set_logger([&](size_t /*ln*/, size_t col, const std::string &msg) {
_error = QString("Error at position %1: %2").arg(col).arg(QString::fromStdString(msg));
});
search.set_logger([this](size_t ln, size_t col, const std::string &msg){logger(ln, col, msg);});
if (!search.parse(ba.data(), result)) {
qDebug().nospace() << "FilterString error for " << expr << "; " << qPrintable(_error);

6
cockatrice/src/game/filters/filter_string.h
View file

@ -21,8 +21,10 @@ struct EmptyType;
typedef AstBase<EmptyType> Ast;
} // namespace peg
class FilterString
class FilterString : QObject
{
Q_OBJECT
public:
FilterString();
explicit FilterString(const QString &exp);
@ -42,6 +44,8 @@ public:
}
private:
void logger(size_t ln, size_t col, const std::string &msg);
QString _error;
Filter result;
};