Add constants for the integer base system

On multiple locations in the code base,
magic numbers are used to mark the base of an intenger conversion.
This commit introduces constants and
replaces the magic numbers in some places.

Author: mmuesly

src/util/mp_arith.h

@@ -18,6 +18,11 @@ Author: Daniel Kroening, [email protected]
 #include "optional.h"
 #include "deprecate.h"
 
+const int DECIMAL_SYSTEM = 10;
+const int OCTAL_SYSTEM = 8;
+const int BINARY_SYSTEM = 2;
+const int HEXADECIMAL_SYSTEM = 16;
+
 // NOLINTNEXTLINE(readability/identifiers)
 typedef BigInt mp_integer;
 
@@ -47,8 +52,11 @@ mp_integer rotate_right(
 mp_integer rotate_left(
   const mp_integer &, const mp_integer &, std::size_t true_size);
 
-const std::string integer2string(const mp_integer &, unsigned base=10);
-const mp_integer string2integer(const std::string &, unsigned base=10);
+const std::string
+integer2string(const mp_integer &, unsigned base = DECIMAL_SYSTEM);
+const mp_integer
+string2integer(const std::string &, unsigned base = DECIMAL_SYSTEM);
+
 const std::string integer2binary(const mp_integer &, std::size_t width);
 const mp_integer binary2integer(const std::string &, bool is_signed);
 

src/util/string2int.h

@@ -6,28 +6,35 @@ Author: Michael Tautschnig, [email protected]
 
 \*******************************************************************/
 
-
 #ifndef CPROVER_UTIL_STRING2INT_H
 #define CPROVER_UTIL_STRING2INT_H
 
+#include "mp_arith.h"
+
 #include <string>
 
 // These check that the string is indeed a valid number,
 // and fail an assertion otherwise.
 // We use those for data types that C++11's std::stoi etc. do not
 // cover.
-unsigned safe_string2unsigned(const std::string &str, int base=10);
-std::size_t safe_string2size_t(const std::string &str, int base=10);
+unsigned
+safe_string2unsigned(const std::string &str, int base = DECIMAL_SYSTEM);
+std::size_t
+safe_string2size_t(const std::string &str, int base = DECIMAL_SYSTEM);
 
 // The below mimic C's atoi/atol: any errors are silently ignored.
 // They are meant to replace atoi/atol.
-int unsafe_string2int(const std::string &str, int base=10);
-unsigned unsafe_string2unsigned(const std::string &str, int base=10);
-std::size_t unsafe_string2size_t(const std::string &str, int base=10);
+int unsafe_string2int(const std::string &str, int base = DECIMAL_SYSTEM);
+unsigned
+unsafe_string2unsigned(const std::string &str, int base = DECIMAL_SYSTEM);
+std::size_t
+unsafe_string2size_t(const std::string &str, int base = DECIMAL_SYSTEM);
 
 // Same for atoll
-long long int unsafe_string2signedlonglong(const std::string &str, int base=10);
+long long int
+unsafe_string2signedlonglong(const std::string &str, int base = DECIMAL_SYSTEM);
 long long unsigned int unsafe_string2unsignedlonglong(
-  const std::string &str, int base=10);
+  const std::string &str,
+  int base = DECIMAL_SYSTEM);
 
 #endif // CPROVER_UTIL_STRING2INT_H