Updated (NON FUNCTIONAL) Version of ParseWithOptions

google · Jan 16, 2025 · 1a8629e · 1a8629e
1 parent 9d7975a
commit 1a8629e
Show file tree

Hide file tree

Showing 11 changed files with 863,757 additions and 16 deletions.
diff --git a/cpp/src/phonenumbers/geocoding/geocoding_data.cc b/cpp/src/phonenumbers/geocoding/geocoding_data.cc
diff --git a/cpp/src/phonenumbers/parsingOptions.cc → cpp/src/phonenumbers/parsingoptions.cc b/cpp/src/phonenumbers/parsingOptions.cc → cpp/src/phonenumbers/parsingoptions.cc
@@ -1,12 +1,12 @@
 #include "i18n/phonenumbers/parsingoptions.h"
 
-#include "i18n/identifiers/regioncode.h"
+#include "phonenumbers/region_code.h"
 
 namespace i18n {
 namespace phonenumbers {
 
 ParsingOptions& ParsingOptions::SetDefaultRegion(
-    i18n_identifiers::RegionCode default_region) {
+    const string& default_region) {
   default_region_ = default_region;
   return *this;
 }

diff --git a/cpp/src/phonenumbers/parsingOptions.h → cpp/src/phonenumbers/parsingoptions.h b/cpp/src/phonenumbers/parsingOptions.h → cpp/src/phonenumbers/parsingoptions.h
@@ -1,7 +1,7 @@
 #ifndef I18N_PHONENUMBERS_PARSINGOPTIONS_H_
 #define I18N_PHONENUMBERS_PARSINGOPTIONS_H_
 
-#include "i18n/identifiers/regioncode.h"
+#include "phonenumbers/test_util.h"
 
 namespace i18n {
 namespace phonenumbers {
@@ -16,7 +16,7 @@ class ParsingOptions {
 
   // Set the value for default_region_.
   ParsingOptions& SetDefaultRegion(
-      i18n_identifiers::RegionCode default_region);
+      const string& default_region);
 
   // Set the value for keep_raw_input_.
   ParsingOptions& SetKeepRawInput(bool keep_raw_input);
@@ -29,8 +29,7 @@ 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.
-  i18n_identifiers::RegionCode default_region_ =
-      i18n_identifiers::RegionCode::ZZ();
+  const string& default_region_ = RegionCode::ZZ();
 
   // 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.