deperecate legacy typedef for int/uint

Author: taku910

src/bpe_model_trainer.cc

@@ -33,7 +33,7 @@ std::string Trainer::Symbol::ToString() const {
 }
 
 Trainer::Symbol *Trainer::GetCharSymbol(char32 c) {
-  const uint64 freq = port::FindWithDefault(required_chars_, c, 1);
+  const uint64_t freq = port::FindWithDefault(required_chars_, c, 1);
   CHECK_GT(freq, 0);
   const auto it = symbols_cache_.find(c);
   if (it != symbols_cache_.end()) {
@@ -55,7 +55,7 @@ Trainer::Symbol *Trainer::GetPairSymbol(const Symbol *left,
     return nullptr;
   }
 
-  const uint64 fp = port::FingerprintCat(left->fp, right->fp);
+  const uint64_t fp = port::FingerprintCat(left->fp, right->fp);
   const auto it = symbols_cache_.find(fp);
   if (it != symbols_cache_.end()) {
     return it->second;
@@ -275,7 +275,7 @@ util::Status Trainer::Train() {
     // Add new bigrams which are created after symbol replacement.
     // We do not need to scan all characters, but scan the neighbors in
     // best_symbol.
-    for (const uint64 &encoded_pos : best_symbol->positions) {
+    for (const uint64_t &encoded_pos : best_symbol->positions) {
       const Position pos = DecodePos(encoded_pos);
 
       if (symbols_[pos.sid][pos.left] == nullptr) {

src/char_model_trainer.cc

@@ -32,7 +32,7 @@ util::Status Trainer::Train() {
   const int vocab_size = trainer_spec_.vocab_size() - meta_pieces_.size();
   CHECK_GE_OR_RETURN(vocab_size, 0);
 
-  uint64 sum = 0;
+  uint64_t sum = 0;
   for (const auto &it : required_chars_) {
     sum += it.second;
   }

src/common.h

@@ -41,17 +41,9 @@
 #include <windows.h>
 #endif
 
-typedef int8_t int8;
-typedef int16_t int16;
-typedef int32_t int32;
-typedef int64_t int64;
-typedef uint8_t uint8;
-typedef uint16_t uint16;
 typedef uint32_t char32;
-typedef uint32_t uint32;
-typedef uint64_t uint64;
 
-static constexpr uint32 kUnicodeError = 0xFFFD;
+static constexpr uint32_t kUnicodeError = 0xFFFD;
 
 template <typename T, size_t N>
 char (&ArraySizeHelper(T (&array)[N]))[N];
@@ -66,7 +58,8 @@ char (&ArraySizeHelper(const T (&array)[N]))[N];
 #if defined(_FREEBSD)
 #include <sys/endian.h>
 #endif
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(_FREEBSD) && !defined(_AIX)
+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(_FREEBSD) && \
+    !defined(_AIX)
 #include <endian.h>
 #if BYTE_ORDER == __BIG_ENDIAN
 #define IS_BIG_ENDIAN
@@ -80,7 +73,7 @@ char (&ArraySizeHelper(const T (&array)[N]))[N];
 namespace sentencepiece {
 namespace util {
 #ifndef OS_WIN
-inline uint32 Swap32(uint32 x) { return __builtin_bswap32(x); }
+inline uint32_t Swap32(uint32_t x) { return __builtin_bswap32(x); }
 #endif  // OS_WIN
 }  // namespace util
 

src/compile_charsmap_main.cc

@@ -127,7 +127,7 @@ struct BinaryBlob {
   os << kHeader;
 
   os << "#if defined(_WIN32) && !defined(__CYGWIN__)\n";
-  os << "constexpr unsigned long long int kNormalizationRules_blob_uint64[] = "
+  os << "constexpr unsigned long long int kNormalizationRules_blob_uint64_t[] = "
         "{\n";
   std::vector<size_t> offset;
   os << ToHexUInt64Array(data, &offset);
@@ -136,7 +136,7 @@ struct BinaryBlob {
   os << "const BinaryBlob kNormalizationRules_blob[] = {\n";
   for (size_t i = 0; i < data.size(); ++i) {
     os << "{ \"" << data[i].first << "\", " << data[i].second.size() << ", ";
-    os << "reinterpret_cast<const char *>(kNormalizationRules_blob_uint64 + "
+    os << "reinterpret_cast<const char *>(kNormalizationRules_blob_uint64_t + "
        << offset[i] << ") },\n";
   }
   os << "};\n";

src/error.cc

@@ -23,7 +23,7 @@
 // We want to define them in other cc file.
 #include "third_party/absl/flags/flag.h"
 #include "third_party/absl/flags/parse.h"
-ABSL_FLAG(int32, minloglevel, 0,
+ABSL_FLAG(int32_t, minloglevel, 0,
           "Messages logged at a lower level than this don't actually.");
 #endif
 

src/init.h

@@ -26,7 +26,7 @@
 #include "third_party/protobuf-lite/google/protobuf/message_lite.h"
 #endif
 
-ABSL_DECLARE_FLAG(int32, minloglevel);
+ABSL_DECLARE_FLAG(int32_t, minloglevel);
 
 namespace sentencepiece {
 inline void ParseCommandLineFlags(const char *usage, int *argc, char ***argv,

src/init_test.cc

@@ -17,10 +17,10 @@
 #include "common.h"
 #include "testharness.h"
 
-ABSL_FLAG(int32, int32_f, 10, "int32_flags");
+ABSL_FLAG(int32_t, int32_f, 10, "int32_flags");
 ABSL_FLAG(bool, bool_f, false, "bool_flags");
-ABSL_FLAG(int64, int64_f, 9223372036854775807LL, "int64_flags");
-ABSL_FLAG(uint64, uint64_f, 18446744073709551615ULL, "uint64_flags");
+ABSL_FLAG(int64_t, int64_f, 9223372036854775807LL, "int64_flags");
+ABSL_FLAG(uint64_t, uint64_f, 18446744073709551615ULL, "uint64_flags");
 ABSL_FLAG(double, double_f, 40.0, "double_flags");
 ABSL_FLAG(std::string, string_f, "str", "string_flags");
 

src/normalization_rule.h

@@ -11,7 +11,7 @@ struct BinaryBlob {
 };
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
-constexpr unsigned long long int kNormalizationRules_blob_uint64[] = {
+constexpr unsigned long long int kNormalizationRules_blob_uint64_t[] = {
     0x0000FC000002BC00, 0x0003243D00031C3E, 0x0002E4CC00032C3C,
     0x8000238200000DB8, 0x000005B80002DCCC, 0x0002E4CC80002376,
     0x8000238600001DB8, 0x000248CC00010D91, 0x00014D8C000038CD,
@@ -40603,13 +40603,13 @@ constexpr unsigned long long int kNormalizationRules_blob_uint64[] = {
 
 const BinaryBlob kNormalizationRules_blob[] = {
     {"nfkc", 240008,
-     reinterpret_cast<const char *>(kNormalizationRules_blob_uint64 + 0)},
+     reinterpret_cast<const char *>(kNormalizationRules_blob_uint64_t + 0)},
     {"nmt_nfkc", 240007,
-     reinterpret_cast<const char *>(kNormalizationRules_blob_uint64 + 30001)},
+     reinterpret_cast<const char *>(kNormalizationRules_blob_uint64_t + 30001)},
     {"nfkc_cf", 247028,
-     reinterpret_cast<const char *>(kNormalizationRules_blob_uint64 + 60002)},
+     reinterpret_cast<const char *>(kNormalizationRules_blob_uint64_t + 60002)},
     {"nmt_nfkc_cf", 247027,
-     reinterpret_cast<const char *>(kNormalizationRules_blob_uint64 + 90881)},
+     reinterpret_cast<const char *>(kNormalizationRules_blob_uint64_t + 90881)},
 };
 #else
 constexpr BinaryBlob kNormalizationRules_blob[] = {

src/sentencepiece_processor.cc

@@ -351,7 +351,7 @@ util::Status SentencePieceProcessor::LoadVocabulary(absl::string_view filename,
     const std::vector<std::string> v = absl::StrSplit(line, '\t');
     CHECK_GE_OR_RETURN(v.size(), 1);
     CHECK_OR_RETURN(!v[0].empty());
-    int32 freq = 1;
+    int32_t freq = 1;
     if (v.size() >= 2) {
       CHECK_OR_RETURN(absl::SimpleAtoi(v[1], &freq))
           << "Could not parse the frequency";

src/spec_parser.h

@@ -47,7 +47,7 @@ namespace sentencepiece {
 
 #define PARSE_INT32(param_name)                                               \
   if (name == #param_name) {                                                  \
-    int32 v;                                                                  \
+    int32_t v;                                                                  \
     if (!string_util::lexical_cast(value, &v))                                \
       return util::StatusBuilder(util::StatusCode::kInvalidArgument, GTL_LOC) \
              << "cannot parse \"" << value << "\" as int.";                   \
@@ -57,7 +57,7 @@ namespace sentencepiece {
 
 #define PARSE_UINT64(param_name)                                              \
   if (name == #param_name) {                                                  \
-    uint64 v;                                                                 \
+    uint64_t v;                                                                 \
     if (!string_util::lexical_cast(value, &v))                                \
       return util::StatusBuilder(util::StatusCode::kInvalidArgument, GTL_LOC) \
              << "cannot parse \"" << value << "\" as int.";                   \