ParsingOptions update (non functional)

google · Jan 24, 2025 · ddcfb51 · ddcfb51
1 parent 1a8629e
commit ddcfb51
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 41 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -267,6 +267,7 @@ set (
   "src/phonenumbers/base/strings/string_piece.cc"
   "src/phonenumbers/default_logger.cc"
   "src/phonenumbers/logger.cc"
+  "src/phonenumbers/parsingoptions.cc"
   "src/phonenumbers/phonemetadata.pb.cc" # Generated by Protocol Buffers.
   "src/phonenumbers/phonenumber.cc"
   "src/phonenumbers/phonenumber.pb.cc"   # Generated by Protocol Buffers.

diff --git a/cpp/src/phonenumbers/parsingoptions.cc b/cpp/src/phonenumbers/parsingoptions.cc
@@ -1,12 +1,10 @@
-#include "i18n/phonenumbers/parsingoptions.h"
-
-#include "phonenumbers/region_code.h"
+#include "phonenumbers/parsingoptions.h"
 
 namespace i18n {
 namespace phonenumbers {
 
 ParsingOptions& ParsingOptions::SetDefaultRegion(
-    const string& default_region) {
+    const std::string& default_region) {
   default_region_ = default_region;
   return *this;
 }

diff --git a/cpp/src/phonenumbers/parsingoptions.h b/cpp/src/phonenumbers/parsingoptions.h
@@ -1,7 +1,7 @@
 #ifndef I18N_PHONENUMBERS_PARSINGOPTIONS_H_
 #define I18N_PHONENUMBERS_PARSINGOPTIONS_H_
 
-#include "phonenumbers/test_util.h"
+#include <string>
 
 namespace i18n {
 namespace phonenumbers {
@@ -12,11 +12,11 @@ namespace phonenumbers {
 //   ParsingOptions().SetDefaultRegion(RegionCode::US()).SetKeepRawInput(true);
 class ParsingOptions {
  public:
-  ParsingOptions() = default;
+  ParsingOptions() : default_region_("ZZ"), keep_raw_input_(false) {};
 
   // Set the value for default_region_.
   ParsingOptions& SetDefaultRegion(
-      const string& default_region);
+      const std::string& default_region);
 
   // Set the value for keep_raw_input_.
   ParsingOptions& SetKeepRawInput(bool keep_raw_input);
@@ -29,11 +29,11 @@ class ParsingOptions {
   // format, the country_code will be set to the one of this default region. If
   // the number is guaranteed to start with a '+' followed by the country
   // calling code, then RegionCode.ZZ or null can be supplied.
-  const string& default_region_ = RegionCode::ZZ();
+  std::string default_region_;
 
   // Whether the raw input should be kept in the PhoneNumber object. If true,
   // the raw_input field and country_code_source fields will be populated.
-  bool keep_raw_input_ = false;
+  bool keep_raw_input_;
 };
 
 }  // namespace phonenumbers

diff --git a/cpp/src/phonenumbers/region_code.h b/cpp/src/phonenumbers/region_code.h
@@ -24,6 +24,7 @@ using std::string;
 
 class RegionCode {
  public:
+
   // Returns a region code string representing the "unknown" region.
   static const char* GetUnknown() {
     return ZZ();

diff --git a/cpp/test/phonenumbers/asyoutypeformatter_test.cc b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
@@ -74,7 +74,7 @@ TEST_F(AsYouTypeFormatterTest, ConvertUnicodeStringPosition) {
 }
 
 TEST_F(AsYouTypeFormatterTest, Constructor) {
-  formatter_.reset(phone_util_.GetAsYouTypeFormatter(const RegionCode::US()));
+  formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::US()));
 
   EXPECT_TRUE(GetCurrentMetadata() != NULL);
 }