diff --git a/addons/misra.py b/addons/misra.py index 021f276d8..41d38bfc7 100755 --- a/addons/misra.py +++ b/addons/misra.py @@ -473,9 +473,9 @@ def isalnum(c): def isHexEscapeSequence(symbols): """Checks that given symbols are valid hex escape sequence. - hexademical-escape-sequence: - \\x hexademical-digit - hexademical-escape-sequence hexademical-digit + hexadecimal-escape-sequence: + \\x hexadecimal-digit + hexadecimal-escape-sequence hexadecimal-digit Reference: n1570 6.4.4.4""" if len(symbols) < 3 or symbols[:2] != '\\x': @@ -506,7 +506,7 @@ def isSimpleEscapeSequence(symbols): def hasNumericEscapeSequence(symbols): - """Check that given string contains octal or hexademical escape sequences.""" + """Check that given string contains octal or hexadecimal escape sequences.""" if '\\' not in symbols: return False for c, cn in grouped(symbols, 2): diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp index b05488e3e..c13446772 100644 --- a/lib/valueflow.cpp +++ b/lib/valueflow.cpp @@ -1937,7 +1937,7 @@ static void valueFlowReverse(TokenList *tokenlist, bailout(tokenlist, errorLogger, tok2, "possible assignment of " + tok2->str() + " by subfunction"); break; } - // Impossible values cant be inconclusive + // Impossible values can't be inconclusive if (val.isImpossible() || val2.isImpossible()) break; val.setInconclusive(inconclusive); @@ -2308,7 +2308,7 @@ static void valueFlowForwardExpression(Token* startToken, FwdAnalysis fwdAnalysis(tokenlist->isCPP(), settings->library); for (const FwdAnalysis::KnownAndToken read : fwdAnalysis.valueFlow(exprTok, startToken, endToken)) { for (const ValueFlow::Value& value : values) { - // Dont set inconclusive values + // Don't set inconclusive values if (value.isInconclusive()) continue; ValueFlow::Value v = value;