Merge branch 'shortNumber' of https://github.com/paween/libPhoneNumber-iOS into shortNumber

# Conflicts:
#	libPhoneNumber.xcodeproj/project.pbxproj
#	libPhoneNumber/Internal/NBRegExMatcher.m
#	libPhoneNumber/Internal/NBRegularExpressionCache.m

libPhoneNumber/Internal/NBRegExMatcher.m

@@ -62,7 +62,7 @@
                                                      options:NSMatchingAnchored
                                                        range:wholeStringRange];
 
-    return (allowsPrefixMatch || exactResult.numberOfRanges > 0)
+    return (allowsPrefixMatch || exactResult.numberOfRanges > 0);
   }
 }
 

libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTest.h

@@ -0,0 +1,29 @@
+//
+//  NBPhoneNumberUtil+ShortNumberTest.h
+//  libPhoneNumber
+//
+//  Created by Paween Itthipalkul on 12/1/17.
+//  Copyright © 2017 Google LLC. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "NBPhoneNumberUtil.h"
+#import "NBPhoneNumberUtil+ShortNumber.h"
+
+#if SHORT_NUMBER_SUPPORT
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Includes methods used only for testing NBPhoneNumberUtil+ShortNumber.
+ */
+@interface NBPhoneNumberUtil(ShortNumberTest)
+
+- (NSString *)exampleShortNumberForCost:(NBEShortNumberCost)cost regionCode:(NSString *)regionCode;
+- (NSString *)exampleShortNumberWithRegionCode:(NSString *)regionCode;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // SHORT_NUMBER_SUPPORT

libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTest.m

@@ -0,0 +1,53 @@
+//
+//  NBPhoneNumberUtil+ShortNumberTest.m
+//  libPhoneNumber
+//
+//  Created by Paween Itthipalkul on 12/1/17.
+//  Copyright © 2017 Google LLC. All rights reserved.
+//
+
+#import "NBPhoneNumberUtil+ShortNumberTest.h"
+
+#import "NBMetadataHelper.h"
+#import "NBPhoneMetadata.h"
+#import "NBPhoneNumberDesc.h"
+#import "NBPhoneNumberUtil+Category.h"
+
+#if SHORT_NUMBER_SUPPORT
+
+@implementation NBPhoneNumberUtil(ShortNumberTest)
+
+- (NSString *)exampleShortNumberForCost:(NBEShortNumberCost)cost regionCode:(NSString *)regionCode {
+  NBPhoneMetaData *metadata = [self.helper shortNumberMetadataForRegion:regionCode];
+  if (metadata == nil) {
+    return @"";
+  }
+
+  NBPhoneNumberDesc *desc = nil;
+  switch (cost) {
+    case NBEShortNumberCostTollFree:
+      desc = metadata.tollFree;
+      break;
+    case NBEShortNumberCostPremiumRate:
+      desc = metadata.premiumRate;
+      break;
+    case NBEShortNumberCostStandardRate:
+      desc = metadata.standardRate;
+      break;
+    case NBEShortNumberCostUnknown:
+      // UNKNOWN_COST numbers are computed by the process of elimination from the other cost
+      // categories.
+      break;
+  }
+
+  return desc.exampleNumber ?: @"";
+}
+
+- (NSString *)exampleShortNumberWithRegionCode:(NSString *)regionCode {
+  NBPhoneMetaData *metadata = [self.helper shortNumberMetadataForRegion:regionCode];
+  return metadata.shortCode.exampleNumber ?: @"";
+}
+
+@end
+
+#endif // SHORT_NUMBER_SUPPORT