RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-01 03:50:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix lang_auto boundaries check. (thanks Randl)

Browse Source
This commit is contained in:
John Preston 2018-11-02 16:01:34 +04:00
parent 78da810114
commit 27d58e1e2a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/codegen/lang/generator.cpp
View File

@ -341,7 +341,7 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
UpcomingIf, UpcomingIf,
}; };
auto checkTypes = QVector<UsedCheckType>(); auto checkTypes = QVector<UsedCheckType>();
auto checkLengthHistory = QVector<int>(1, 0); auto checkLengthHistory = QVector<int>();
auto chars = QString(); auto chars = QString();
auto tabsUsed = 1; auto tabsUsed = 1;
@ -354,7 +354,6 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
auto wasType = checkTypes.back(); auto wasType = checkTypes.back();
chars.resize(chars.size() - 1); chars.resize(chars.size() - 1);
checkTypes.pop_back(); checkTypes.pop_back();
checkLengthHistory.pop_back();
if (wasType == UsedCheckType::Switch || wasType == UsedCheckType::If) { if (wasType == UsedCheckType::Switch || wasType == UsedCheckType::If) {
--tabsUsed; --tabsUsed;
if (wasType == UsedCheckType::Switch) { if (wasType == UsedCheckType::Switch) {
@ -362,6 +361,7 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
} }
if ((!chars.isEmpty() && key.midRef(0, chars.size()) != chars) || key == chars) { if ((!chars.isEmpty() && key.midRef(0, chars.size()) != chars) || key == chars) {
source_->stream() << tabs(tabsUsed) << "}\n"; source_->stream() << tabs(tabsUsed) << "}\n";
checkLengthHistory.pop_back();
} }
} }
} }
@ -422,13 +422,20 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
} }
} }
auto usedIfForCheck = !weContinueOldSwitch && (usedIfForCheckCount > 0); auto usedIfForCheck = !weContinueOldSwitch && (usedIfForCheckCount > 0);
const auto checkedLength = checkLengthHistory.isEmpty()
? 0
: checkLengthHistory.back();
const auto requiredLength = qMax(
minimalLengthCheck,
checkedLength);
auto checkLengthCondition = QString(); auto checkLengthCondition = QString();
if (weContinueOldSwitch) { if (weContinueOldSwitch) {
weContinueOldSwitch = false; weContinueOldSwitch = false;
} else { } else {
checkLengthCondition = (minimalLengthCheck > checkLengthHistory.back()) ? ("size >= " + QString::number(minimalLengthCheck)) : QString(); checkLengthCondition = (requiredLength > checkedLength) ? ("size >= " + QString::number(requiredLength)) : QString();
if (!usedIfForCheck) { if (!usedIfForCheck) {
source_->stream() << tabs(tabsUsed) << (checkLengthCondition.isEmpty() ? QString() : ("if (" + checkLengthCondition + ") ")) << "switch (data[" << checking << "]) {\n"; source_->stream() << tabs(tabsUsed) << (checkLengthCondition.isEmpty() ? QString() : ("if (" + checkLengthCondition + ") ")) << "switch (data[" << checking << "]) {\n";
checkLengthHistory.push_back(requiredLength);
} }
} }
if (usedIfForCheck) { if (usedIfForCheck) {
@ -442,11 +449,11 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
conditions.push_front(checkLengthCondition); conditions.push_front(checkLengthCondition);
} }
source_->stream() << tabs(tabsUsed) << "if (" << conditions.join(" && ") << ") {\n"; source_->stream() << tabs(tabsUsed) << "if (" << conditions.join(" && ") << ") {\n";
checkLengthHistory.push_back(requiredLength);
checkTypes.push_back(UsedCheckType::If); checkTypes.push_back(UsedCheckType::If);
for (auto i = 1; i != usedIfForCheckCount; ++i) { for (auto i = 1; i != usedIfForCheckCount; ++i) {
checkTypes.push_back(UsedCheckType::UpcomingIf); checkTypes.push_back(UsedCheckType::UpcomingIf);
chars.push_back(keyChar); chars.push_back(keyChar);
checkLengthHistory.push_back(qMax(minimalLengthCheck, checkLengthHistory.back()));
keyChar = name[checking + i]; keyChar = name[checking + i];
} }
} else { } else {
@ -455,7 +462,6 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
} }
++tabsUsed; ++tabsUsed;
chars.push_back(keyChar); chars.push_back(keyChar);
checkLengthHistory.push_back(qMax(minimalLengthCheck, checkLengthHistory.back()));
} }
source_->stream() << tabs(tabsUsed) << "return (size == " << chars.size() << ") ? " << computeResult(name) << " : " << invalidResult << ";\n"; source_->stream() << tabs(tabsUsed) << "return (size == " << chars.size() << ") ? " << computeResult(name) << " : " << invalidResult << ";\n";
} }