Skip to content

Overall printf rework #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gulrak merged 8 commits into from
Apr 28, 2026
Merged

Overall printf rework #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
20e6ab7
Add TPrint method with compile-time-safe formatting using fmtlib
gulrak Apr 23, 2026
169d676
Add optional secondary report statistics calculation in Zugvorlage
gulrak Apr 23, 2026
6cdbb10
Refactor COutput calls: replace `TPrintf` with `TPrint` or `TWrite` f…
gulrak Apr 23, 2026
8c5cee4
Refactor `CMessage` handling: replace `shared_ptr` with `unique_ptr` …
gulrak Apr 23, 2026
dadb546
Refactored output calls to use `COutput::Target` for consistency and …
gulrak Apr 24, 2026
b2b31c6
Replace `TPrintf` with modernized `TPrint`/`TWrite` throughout the co…
gulrak Apr 25, 2026
5c9bb88
Replace `snprintf`, `fprintf`, `printf`, and similar legacy formattin…
gulrak Apr 28, 2026
13e51d8
Wrap long detail outputs for EINHEIT-lines.
gulrak Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 10 additions & 31 deletions EBase/Expression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,7 @@ bool Expression::getValue(const char* name, Value* value)
return true;
}
else {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Undeklarierte Variable '%s' verwendet.", name);
value->error(Buff);
// *value = Value( name );
value->error(fmt::format("Undeklarierte Variable '{}' verwendet.", name));
return false;
}
}
Expand Down Expand Up @@ -821,18 +818,14 @@ int Expression::parseAssignment(Value* r)
poContainer->remove(poObject->index[0]);
}
else {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Falsche Indizierung im Behaelter '%s'.", poObject->label.c_str());
r->error(Buff);
r->error(fmt::format("Falsche Indizierung im Behaelter '{}'.", poObject->label));
ERR(E_BADINDEX);
}
}
else {
Value oV;
if (!setValue(sT.c_str(), &oV, _force)) {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Zuweisung an undefinierte Variable '%s'.", sT.c_str());
r->error(Buff);
r->error(fmt::format("Zuweisung an undefinierte Variable '{}'.", sT));
ERR(E_UNKNOWN);
}
}
Expand All @@ -842,9 +835,7 @@ int Expression::parseAssignment(Value* r)
if (poContainer) {
if (poObject->index.size() == 1) {
if (!poContainer->setAt(poObject->index[0], *r)) {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Falsche Indizierung im Behaelter '%s'.", poObject->label.c_str());
r->error(Buff);
r->error(fmt::format("Falsche Indizierung im Behaelter '{}'.", poObject->label));
ERR(E_BADINDEX);
}
}
Expand All @@ -853,9 +844,7 @@ int Expression::parseAssignment(Value* r)
*poContainer = *r;
}
else if (poObject->index.size()) {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Falsche Indizierung im Behaelter '%s'.", poObject->label.c_str());
r->error(Buff);
r->error(fmt::format("Falsche Indizierung im Behaelter '{}'.", poObject->label));
ERR(E_BADINDEX);
}
else {
Expand Down Expand Up @@ -889,26 +878,20 @@ int Expression::parseAssignment(Value* r)
}
}
else if (sT[0] == '$' && (!poObject->index.empty() || poObject->next)) {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Zuweisung ueber Behaelter/Objekt-Zugriff an Variable '%s'.", sT.c_str());
r->error(Buff);
r->error(fmt::format("Zuweisung ueber Behaelter/Objekt-Zugriff an Variable '{}'.", sT));
ERR(E_BADINDEX);
}
else if (sT[0] == '$') {
if (!setValue(sT.c_str(), r, _force)) {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Zuweisung an undefinierte Variable '%s'.", sT.c_str());
r->error(Buff);
r->error(fmt::format("Zuweisung an undefinierte Variable '{}'.", sT));
ERR(E_UNKNOWN);
}
}
else if (oRef.isValid()) {
oRef.self() = *r;
}
else {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Fehlerhafte Zuweisung, '%s' ist kein gueltiges Zuweisungsziel.", sT.c_str());
r->error(Buff);
r->error(fmt::format("Fehlerhafte Zuweisung, '{}' ist kein gueltiges Zuweisungsziel.", sT));
ERR(E_SYNTAX);
}
return 1;
Expand Down Expand Up @@ -1098,9 +1081,7 @@ void Expression::parsePrimary(Value* r, CReference* pRef)
nextToken();
evalExpr(&oIdx);
if (_token[0] != ')' || (oIdx.asLong() < 0 && oIdx.asLong() > poContainer->size())) {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Falsche Indizierung im Behaelter '%s'.", _object->label.c_str());
r->error(Buff);
r->error(fmt::format("Falsche Indizierung im Behaelter '{}'.", _object->label));
ERR(E_SYNTAX);
}
*r = poContainer->getNth(oIdx.asLong());
Expand All @@ -1109,9 +1090,7 @@ void Expression::parsePrimary(Value* r, CReference* pRef)
*r = *_container;
}
else {
char Buff[512];
snprintf(Buff, sizeof(Buff), "Falsche Indizierung im Behaelter '%s'.", _object->label.c_str());
r->error(Buff);
r->error(fmt::format("Falsche Indizierung im Behaelter '{}'.", _object->label));
ERR(E_SYNTAX);
}
nextToken();
Expand Down
Loading
Loading