diff options
| -rw-r--r-- | cli/main.cpp | 2 | ||||
| -rw-r--r-- | parsingtoolbox.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cli/main.cpp b/cli/main.cpp index 392d555..6e9e49f 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -451,6 +451,8 @@ int startDiceParsing(QStringList& cmds, QString& treeFile, bool withColor, EXPOR #endif } } + else + rt = 1; } return rt; } diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index 5551998..1d873c2 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -502,7 +502,7 @@ QStringList ParsingToolBox::allFirstResultAsString(bool& hasAlias) const { QVariant var; auto stringPair= hasResultOfType(Dice::RESULT_TYPE::STRING, node); - auto scalarPair= hasResultOfType(Dice::RESULT_TYPE::SCALAR, node, true); + auto scalarPair= hasResultOfType(Dice::RESULT_TYPE::SCALAR, node); if(stringPair.first) { stringListResult << stringPair.second.toString(); @@ -2341,7 +2341,10 @@ SubtituteInfo ParsingToolBox::readPlaceHolderFromString(const QString& source, i QString ParsingToolBox::number(qreal value) { - return QString::number(value, 'g', 20); + if(value > 1000000) + return QString::number(value, 'f', 20); + else + return QString::number(value); } ExportedDiceResult ParsingToolBox::finalDiceResultFromInstruction(ExecutionNode* start) |