Skip to content

Commit 58b0ed7

Browse files
Leander SchultenLeander Schulten
Leander Schulten
authored and
Leander Schulten
committed
Fix typo
1 parent 6e90e74 commit 58b0ed7

7 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎lib/checktype.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,10 @@ static bool checkTypeCombination(ValueType src, ValueType tgt, const Settings& s
324324

325325
const std::size_t sizeSrc = ValueFlow::getSizeOf(src,
326326
settings,
327-
ValueFlow::Accuracy::ExcactOrZero);
327+
ValueFlow::Accuracy::ExactOrZero);
328328
const std::size_t sizeTgt = ValueFlow::getSizeOf(tgt,
329329
settings,
330-
ValueFlow::Accuracy::ExcactOrZero);
330+
ValueFlow::Accuracy::ExactOrZero);
331331
if (!(sizeSrc > 0 && sizeTgt > 0 && sizeSrc < sizeTgt))
332332
return false;
333333

‎lib/token.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ nonneg int Token::getStrSize(const Token *tok, const Settings &settings)
784784
if (tok->valueType()) {
785785
ValueType vt(*tok->valueType());
786786
vt.pointer = 0;
787-
sizeofType = ValueFlow::getSizeOf(vt, settings, ValueFlow::Accuracy::ExcactOrZero);
787+
sizeofType = ValueFlow::getSizeOf(vt, settings, ValueFlow::Accuracy::ExactOrZero);
788788
}
789789
return getStrArraySize(tok) * sizeofType;
790790
}

‎lib/valueflow.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ static Result accumulateStructMembers(const Scope* scope, F f, ValueFlow::Accura
454454
else
455455
total = f(total, *vt, dim);
456456
}
457-
if (accuracy == ValueFlow::Accuracy::ExcactOrZero && total == 0)
457+
if (accuracy == ValueFlow::Accuracy::ExactOrZero && total == 0)
458458
return {0, false};
459459
}
460460
return {total, true};
@@ -538,7 +538,7 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings, Accur
538538
size_t n = ValueFlow::getSizeOf(vt2, settings,accuracy, ++maxRecursion);
539539
size_t a = getAlignOf(vt2, settings, accuracy);
540540
if (n == 0 || a == 0)
541-
return accuracy == Accuracy::ExcactOrZero ? 0 : total;
541+
return accuracy == Accuracy::ExactOrZero ? 0 : total;
542542
n *= dim;
543543
size_t padding = (a - (total % a)) % a;
544544
return vt.typeScope->type == ScopeType::eUnion ? std::max(total, n) : total + padding + n;
@@ -552,12 +552,12 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings, Accur
552552
return v;
553553
});
554554
}
555-
if (accuracy == Accuracy::ExcactOrZero && total == 0 && !result.success)
555+
if (accuracy == Accuracy::ExactOrZero && total == 0 && !result.success)
556556
return 0;
557557
total = std::max(size_t{1}, total);
558558
size_t align = getAlignOf(vt, settings, accuracy);
559559
if (align == 0)
560-
return accuracy == Accuracy::ExcactOrZero ? 0 : total;
560+
return accuracy == Accuracy::ExactOrZero ? 0 : total;
561561
total += (align - (total % align)) % align;
562562
return total;
563563
}
@@ -4148,10 +4148,10 @@ static std::list<ValueFlow::Value> truncateValues(std::list<ValueFlow::Value> va
41484148
if (!dst || !dst->isIntegral())
41494149
return values;
41504150

4151-
const size_t sz = ValueFlow::getSizeOf(*dst, settings, ValueFlow::Accuracy::ExcactOrZero);
4151+
const size_t sz = ValueFlow::getSizeOf(*dst, settings, ValueFlow::Accuracy::ExactOrZero);
41524152

41534153
if (src) {
4154-
const size_t osz = ValueFlow::getSizeOf(*src, settings, ValueFlow::Accuracy::ExcactOrZero);
4154+
const size_t osz = ValueFlow::getSizeOf(*src, settings, ValueFlow::Accuracy::ExactOrZero);
41554155
if (osz >= sz && dst->sign == ValueType::Sign::SIGNED && src->sign == ValueType::Sign::UNSIGNED) {
41564156
values.remove_if([&](const ValueFlow::Value& value) {
41574157
if (!value.isIntValue())

‎lib/valueflow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ namespace ValueFlow {
6161
std::string eitherTheConditionIsRedundant(const Token *condition);
6262

6363
enum class Accuracy : std::uint8_t {
64-
ExcactOrZero,
64+
ExactOrZero,
6565
LowerBound,
6666
};
6767

‎lib/vf_analyzers.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ struct ValueFlowAnalyzer : Analyzer {
353353
if (dst) {
354354
const size_t sz = ValueFlow::getSizeOf(*dst,
355355
settings,
356-
ValueFlow::Accuracy::ExcactOrZero);
356+
ValueFlow::Accuracy::ExactOrZero);
357357
if (sz > 0 && sz < sizeof(MathLib::biguint)) {
358358
MathLib::bigint newvalue = ValueFlow::truncateIntValue(value->intvalue, sz, dst->sign);
359359

‎lib/vf_common.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ namespace ValueFlow
114114
{
115115
const ValueType &valueType = ValueType::parseDecl(typeTok, settings);
116116

117-
return getSizeOf(valueType, settings, ValueFlow::Accuracy::ExcactOrZero);
117+
return getSizeOf(valueType, settings, ValueFlow::Accuracy::ExactOrZero);
118118
}
119119

120120
// Handle various constants..
@@ -125,7 +125,7 @@ namespace ValueFlow
125125
MathLib::bigint signedValue = MathLib::toBigNumber(tok);
126126
const ValueType* vt = tok->valueType();
127127
if (vt && vt->sign == ValueType::UNSIGNED && signedValue < 0
128-
&& getSizeOf(*vt, settings, ValueFlow::Accuracy::ExcactOrZero)
128+
&& getSizeOf(*vt, settings, ValueFlow::Accuracy::ExactOrZero)
129129
< sizeof(MathLib::bigint)) {
130130
MathLib::bigint minValue{}, maxValue{};
131131
if (getMinMaxValues(tok->valueType(), settings.platform, minValue, maxValue))
@@ -162,7 +162,7 @@ namespace ValueFlow
162162
!tok->next()->astOperand2()->valueType()->isEnum()) { // <- TODO this is a bailout, handle enum with non-int types
163163
const size_t sz = getSizeOf(*tok->next()->astOperand2()->valueType(),
164164
settings,
165-
ValueFlow::Accuracy::ExcactOrZero);
165+
ValueFlow::Accuracy::ExactOrZero);
166166
if (sz) {
167167
Value value(sz);
168168
value.setKnown();
@@ -181,7 +181,7 @@ namespace ValueFlow
181181
}
182182
if (Token::simpleMatch(tok, "sizeof ( *")) {
183183
const ValueType *vt = tok->tokAt(2)->valueType();
184-
const size_t sz = vt ? getSizeOf(*vt, settings, ValueFlow::Accuracy::ExcactOrZero)
184+
const size_t sz = vt ? getSizeOf(*vt, settings, ValueFlow::Accuracy::ExactOrZero)
185185
: 0;
186186
if (sz > 0) {
187187
Value value(sz);
@@ -245,7 +245,7 @@ namespace ValueFlow
245245
} else if (var->valueType()) {
246246
size = getSizeOf(*var->valueType(),
247247
settings,
248-
ValueFlow::Accuracy::ExcactOrZero);
248+
ValueFlow::Accuracy::ExactOrZero);
249249
} else if (!var->type()) {
250250
size = getSizeOfType(var->typeStartToken(), settings);
251251
}
@@ -294,7 +294,7 @@ namespace ValueFlow
294294
}
295295
} else if (!tok2->type()) {
296296
const ValueType& vt = ValueType::parseDecl(tok2, settings);
297-
size_t sz = getSizeOf(vt, settings, ValueFlow::Accuracy::ExcactOrZero);
297+
size_t sz = getSizeOf(vt, settings, ValueFlow::Accuracy::ExactOrZero);
298298
const Token* brac = tok2->astParent();
299299
while (Token::simpleMatch(brac, "[")) {
300300
const Token* num = brac->astOperand2();

‎lib/vf_settokenvalue.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ namespace ValueFlow
8383
// If the sign is the same there is no truncation
8484
if (vt1->sign == vt2->sign)
8585
return value;
86-
const size_t n1 = getSizeOf(*vt1, settings, ValueFlow::Accuracy::ExcactOrZero);
87-
const size_t n2 = getSizeOf(*vt2, settings, ValueFlow::Accuracy::ExcactOrZero);
86+
const size_t n1 = getSizeOf(*vt1, settings, ValueFlow::Accuracy::ExactOrZero);
87+
const size_t n2 = getSizeOf(*vt2, settings, ValueFlow::Accuracy::ExactOrZero);
8888
ValueType::Sign sign = ValueType::Sign::UNSIGNED;
8989
if (n1 < n2)
9090
sign = vt2->sign;
@@ -379,8 +379,8 @@ namespace ValueFlow
379379
const ValueType &valueType = ValueType::parseDecl(castType, settings);
380380
if (value.isImpossible() && value.isIntValue() && value.intvalue < 0
381381
&& astIsUnsigned(tok) && valueType.sign == ValueType::SIGNED && tok->valueType()
382-
&& getSizeOf(*tok->valueType(), settings, ValueFlow::Accuracy::ExcactOrZero)
383-
>= getSizeOf(valueType, settings, ValueFlow::Accuracy::ExcactOrZero))
382+
&& getSizeOf(*tok->valueType(), settings, ValueFlow::Accuracy::ExactOrZero)
383+
>= getSizeOf(valueType, settings, ValueFlow::Accuracy::ExactOrZero))
384384
return;
385385
setTokenValueCast(parent, valueType, value, settings);
386386
}
@@ -645,7 +645,7 @@ namespace ValueFlow
645645
if (dst) {
646646
const size_t sz = ValueFlow::getSizeOf(*dst,
647647
settings,
648-
ValueFlow::Accuracy::ExcactOrZero);
648+
ValueFlow::Accuracy::ExactOrZero);
649649
MathLib::bigint newvalue = ValueFlow::truncateIntValue(v.intvalue + 1, sz, dst->sign);
650650
if (v.bound != ValueFlow::Value::Bound::Point) {
651651
if (newvalue < v.intvalue) {
@@ -677,7 +677,7 @@ namespace ValueFlow
677677
if (dst) {
678678
const size_t sz = ValueFlow::getSizeOf(*dst,
679679
settings,
680-
ValueFlow::Accuracy::ExcactOrZero);
680+
ValueFlow::Accuracy::ExactOrZero);
681681
MathLib::bigint newvalue = ValueFlow::truncateIntValue(v.intvalue - 1, sz, dst->sign);
682682
if (v.bound != ValueFlow::Value::Bound::Point) {
683683
if (newvalue > v.intvalue) {

0 commit comments

Comments
 (0)