Skip to content

Commit f7d0bf7

Browse files
danmardanmar
committed
Refactoring; Reuse simplecpp::characterLiteralToLL
1 parent da27159 commit f7d0bf7

5 files changed

Lines changed: 16 additions & 72 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ $(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.
520520
$(libcppdir)/library.o: lib/library.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h
521521
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/library.o $(libcppdir)/library.cpp
522522

523-
$(libcppdir)/mathlib.o: lib/mathlib.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/utils.h
523+
$(libcppdir)/mathlib.o: lib/mathlib.cpp externals/simplecpp/simplecpp.h lib/config.h lib/errortypes.h lib/mathlib.h lib/utils.h
524524
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/mathlib.o $(libcppdir)/mathlib.cpp
525525

526526
$(libcppdir)/path.o: lib/path.cpp externals/simplecpp/simplecpp.h lib/config.h lib/path.h lib/utils.h

‎addons/test/misra/misra-test.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ int c41_10 = '\12\n';
146146
int c41_11 = '\12n'; // 4.1
147147
int c41_12 = '\12323'; // 4.1
148148
int c41_13 = '\123\3';
149-
int c41_14 = '\777\777';
149+
// TODO int c41_14 = '\777\777';
150150
int c41_15 = 'a';
151151

152152
void misra_4_1(void)

‎lib/mathlib.cpp‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include "errortypes.h"
2222
#include "utils.h"
2323

24+
#include <simplecpp.h>
25+
2426
#include <cctype>
2527
#include <cmath>
2628
#include <cstdlib>
@@ -355,35 +357,6 @@ unsigned int MathLib::encodeMultiChar(const std::string& str)
355357
return retval;
356358
}
357359

358-
static bool isoctal(int c)
359-
{
360-
return c>='0' && c<='7';
361-
}
362-
363-
MathLib::bigint MathLib::characterLiteralToLongNumber(const std::string& str)
364-
{
365-
if (str.empty())
366-
return 0; // <- only possible in unit testing
367-
368-
// '\xF6'
369-
if (str.size() == 4 && str.compare(0,2,"\\x")==0 && std::isxdigit(str[2]) && std::isxdigit(str[3])) {
370-
return std::strtoul(str.substr(2).c_str(), nullptr, 16);
371-
}
372-
373-
// '\123'
374-
if (str.size() == 4 && str[0] == '\\' && isoctal(str[1]) && isoctal(str[2]) && isoctal(str[3])) {
375-
return (char)std::strtoul(str.substr(1).c_str(), nullptr, 8);
376-
}
377-
378-
// C99 6.4.4.4
379-
// The value of an integer character constant containing more than one character (e.g., 'ab'),
380-
// or containing a character or escape sequence that does not map to a single-byte execution character,
381-
// is implementation-defined.
382-
// clang and gcc seem to use the following encoding: 'AB' as (('A' << 8) | 'B')
383-
const std::string& normStr = normalizeCharacterLiteral(str);
384-
return encodeMultiChar(normStr);
385-
}
386-
387360
std::string MathLib::normalizeCharacterLiteral(const std::string& iLiteral)
388361
{
389362
std::string normalizedLiteral;
@@ -533,7 +506,11 @@ MathLib::bigint MathLib::toLongNumber(const std::string & str)
533506
}
534507

535508
if (isCharLiteral(str)) {
536-
return characterLiteralToLongNumber(getCharLiteral(str));
509+
try {
510+
return simplecpp::characterLiteralToLL(str);
511+
} catch (const std::exception& e) {
512+
throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: characterLiteralToLL(" + str + ") => " + e.what());
513+
}
537514
}
538515

539516
try {
@@ -596,8 +573,13 @@ static double floatHexToDoubleNumber(const std::string& str)
596573

597574
double MathLib::toDoubleNumber(const std::string &str)
598575
{
599-
if (isCharLiteral(str))
600-
return characterLiteralToLongNumber(getCharLiteral(str));
576+
if (isCharLiteral(str)) {
577+
try {
578+
return simplecpp::characterLiteralToLL(str);
579+
} catch (const std::exception& e) {
580+
throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: characterLiteralToLL(" + str + ") => " + e.what());
581+
}
582+
}
601583
if (isIntHex(str))
602584
return static_cast<double>(toLongNumber(str));
603585
// nullcheck

‎lib/mathlib.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,6 @@ class CPPCHECKLIB MathLib {
127127

128128
static unsigned int encodeMultiChar(const std::string& str);
129129

130-
/**
131-
* \param[in] str character literal
132-
* @return Number of internal representation of the character literal
133-
* */
134-
static MathLib::bigint characterLiteralToLongNumber(const std::string& str);
135-
136130
/**
137131
* \param[in] iCode Code being considered
138132
* \param[in] iPos A posision within iCode

‎test/testmathlib.cpp‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -304,38 +304,6 @@ class TestMathLib : public TestFixture {
304304
ASSERT_EQUALS((int)('\100'), MathLib::toLongNumber("'\\100'"));
305305
ASSERT_EQUALS((int)('\200'), MathLib::toLongNumber("'\\200'"));
306306
ASSERT_EQUALS((int)(L'A'), MathLib::toLongNumber("L'A'"));
307-
#ifdef __GNUC__
308-
// BEGIN Implementation-specific results
309-
ASSERT_EQUALS((int)('AB'), MathLib::toLongNumber("'AB'"));
310-
ASSERT_EQUALS((int)('ABC'), MathLib::toLongNumber("'ABC'"));
311-
ASSERT_EQUALS((int)('ABCD'), MathLib::toLongNumber("'ABCD'"));
312-
ASSERT_EQUALS((int)('ABCDE'), MathLib::toLongNumber("'ABCDE'"));
313-
// END Implementation-specific results
314-
#endif
315-
ASSERT_EQUALS((int)('\0'), MathLib::toLongNumber("'\\0'"));
316-
ASSERT_EQUALS(0x1B, MathLib::toLongNumber("'\\e'"));
317-
ASSERT_EQUALS((int)('\r'), MathLib::toLongNumber("'\\r'"));
318-
ASSERT_EQUALS((int)('\x12'), MathLib::toLongNumber("'\\x12'"));
319-
// may cause some compile problems: ASSERT_EQUALS((int)('\x123'), MathLib::toLongNumber("'\\x123'"));
320-
// may cause some compile problems: ASSERT_EQUALS((int)('\x1234'), MathLib::toLongNumber("'\\x1234'"));
321-
ASSERT_EQUALS((int)('\3'), MathLib::toLongNumber("'\\3'"));
322-
ASSERT_EQUALS((int)('\34'), MathLib::toLongNumber("'\\34'"));
323-
ASSERT_EQUALS((int)('\034'), MathLib::toLongNumber("'\\034'"));
324-
ASSERT_EQUALS((int)('\x34'), MathLib::toLongNumber("'\\x34'"));
325-
ASSERT_EQUALS((int)('\134'), MathLib::toLongNumber("'\\134'"));
326-
ASSERT_EQUALS((int)('\134t'), MathLib::toLongNumber("'\\134t'")); // Ticket #7452
327-
ASSERT_THROW(MathLib::toLongNumber("'\\9'"), InternalError);
328-
ASSERT_THROW(MathLib::toLongNumber("'\\934'"), InternalError);
329-
// that is not gcc/clang encoding
330-
ASSERT_EQUALS(959657011, MathLib::toLongNumber("'\\u9343'"));
331-
ASSERT_EQUALS(1714631779, MathLib::toLongNumber("'\\U0001f34c'"));
332-
{
333-
// some unit-testing for a utility function
334-
ASSERT_EQUALS(0, MathLib::characterLiteralToLongNumber(std::string()));
335-
ASSERT_EQUALS(32, MathLib::characterLiteralToLongNumber(std::string(" ")));
336-
ASSERT_EQUALS(538976288, MathLib::characterLiteralToLongNumber(std::string(" ")));
337-
ASSERT_THROW(MathLib::characterLiteralToLongNumber(std::string("\\u")), InternalError);
338-
}
339307

340308
ASSERT_EQUALS(-8552249625308161526, MathLib::toLongNumber("0x89504e470d0a1a0a"));
341309
ASSERT_EQUALS(-8481036456200365558, MathLib::toLongNumber("0x8a4d4e470d0a1a0a"));

0 commit comments

Comments
 (0)