Removing all references to the possible number pattern field in code (#1432)

This excludes editing the proto file itself, or the auto-generated or hand-crafted fields that are derived from it.

cpp/src/phonenumbers/matcher_api.h

@@ -39,13 +39,6 @@ class MatcherApi {
   virtual bool MatchesNationalNumber(const string& national_number,
                                      const PhoneNumberDesc& number_desc,
                                      bool allow_prefix_match) const = 0;
-
-  // Returns whether the given national number (a string containing only decimal
-  // digits) matches the possible number pattern defined in the given
-  // PhoneNumberDesc message.
-  virtual bool MatchesPossibleNumber(
-      const string& national_number,
-      const PhoneNumberDesc& number_desc) const = 0;
 };
 
 }  // namespace phonenumbers

cpp/src/phonenumbers/phonenumber.cc

@@ -68,18 +68,35 @@ bool ExactlySameAs(const PhoneNumberDesc& first_number_desc,
       second_number_desc.national_number_pattern()) {
     return false;
   }
-  if (first_number_desc.has_possible_number_pattern() !=
-      second_number_desc.has_possible_number_pattern() ||
-      first_number_desc.possible_number_pattern() !=
-      second_number_desc.possible_number_pattern()) {
-    return false;
-  }
   if (first_number_desc.has_example_number() !=
       second_number_desc.has_example_number() ||
       first_number_desc.example_number() !=
       second_number_desc.example_number()) {
     return false;
   }
+  if (first_number_desc.possible_length_size() !=
+      second_number_desc.possible_length_size()) {
+    return false;
+  } else {
+    for (int i = 0; i < first_number_desc.possible_length_size(); ++i) {
+      if (first_number_desc.possible_length(i) !=
+          second_number_desc.possible_length(i)) {
+        return false;
+      }
+    }
+  }
+  if (first_number_desc.possible_length_local_only_size() !=
+      second_number_desc.possible_length_local_only_size()) {
+    return false;
+  } else {
+    for (int i = 0; i < first_number_desc.possible_length_local_only_size();
+        ++i) {
+      if (first_number_desc.possible_length_local_only(i) !=
+          second_number_desc.possible_length_local_only(i)) {
+        return false;
+      }
+    }
+  }
   return true;
 }
 

cpp/src/phonenumbers/regex_based_matcher.cc

@@ -45,11 +45,6 @@ bool RegexBasedMatcher::MatchesNationalNumber(
                allow_prefix_match);
 }
 
-bool RegexBasedMatcher::MatchesPossibleNumber(
-    const string& national_number, const PhoneNumberDesc& number_desc) const {
-  return Match(national_number, number_desc.possible_number_pattern(), false);
-}
-
 bool RegexBasedMatcher::Match(const string& national_number,
                               const string& number_pattern,
                               bool allow_prefix_match) const {

cpp/src/phonenumbers/regex_based_matcher.h

@@ -42,9 +42,6 @@ class RegexBasedMatcher : public MatcherApi {
                              const PhoneNumberDesc& number_desc,
                              bool allow_prefix_match) const;
 
-  bool MatchesPossibleNumber(const string& national_number,
-                             const PhoneNumberDesc& number_desc) const;
-
  private:
   bool Match(const string& national_number, const string& number_pattern,
              bool allow_prefix_match) const;

cpp/test/phonenumbers/phonenumberutil_test.cc

@@ -221,11 +221,8 @@ TEST_F(PhoneNumberUtilTest, GetInstanceLoadUSMetadata) {
   EXPECT_EQ("$1 $2 $3", metadata->number_format(1).format());
   EXPECT_EQ("[13-689]\\d{9}|2[0-35-9]\\d{8}",
             metadata->general_desc().national_number_pattern());
-  EXPECT_EQ("\\d{7}(?:\\d{3})?",
-            metadata->general_desc().possible_number_pattern());
   EXPECT_EQ("[13-689]\\d{9}|2[0-35-9]\\d{8}",
             metadata->fixed_line().national_number_pattern());
-  EXPECT_EQ("\\d{10}", metadata->toll_free().possible_number_pattern());
   EXPECT_EQ(1, metadata->general_desc().possible_length_size());
   EXPECT_EQ(10, metadata->general_desc().possible_length(0));
   // Possible lengths are the same as the general description, so aren't stored
@@ -234,7 +231,6 @@ TEST_F(PhoneNumberUtilTest, GetInstanceLoadUSMetadata) {
   EXPECT_EQ("900\\d{7}", metadata->premium_rate().national_number_pattern());
   // No shared-cost data is available, so it should be initialised to "NA".
   EXPECT_EQ("NA", metadata->shared_cost().national_number_pattern());
-  EXPECT_EQ("NA", metadata->shared_cost().possible_number_pattern());
 }
 
 TEST_F(PhoneNumberUtilTest, GetInstanceLoadDEMetadata) {
@@ -257,9 +253,8 @@ TEST_F(PhoneNumberUtilTest, GetInstanceLoadDEMetadata) {
   EXPECT_EQ("$1 $2 $3", metadata->number_format(5).format());
   EXPECT_EQ("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}",
             metadata->fixed_line().national_number_pattern());
-  EXPECT_EQ("\\d{2,14}", metadata->fixed_line().possible_number_pattern());
   EXPECT_EQ("30123456", metadata->fixed_line().example_number());
-  EXPECT_EQ("\\d{10}", metadata->toll_free().possible_number_pattern());
+  EXPECT_EQ(10, metadata->toll_free().possible_length(0));
   EXPECT_EQ("900([135]\\d{6}|9\\d{7})",
             metadata->premium_rate().national_number_pattern());
 }