Skip to content

The regex can't produce any error/exception #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Coeur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

The regex can't produce any error/exception #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions Objective-C/FlickerNumber/Classes/UILabel+FlickerNumber.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,21 +399,16 @@ - (NSNumberFormatter *)defaultFormatter {
* @return The string-format String.
*/
- (NSString *)regexNumberFormat:(NSString *)formatString {
NSError *regexError = nil;
NSRegularExpression *regex =
[NSRegularExpression regularExpressionWithPattern:@"^%((\\d+.\\d+)|(\\d+).|(.\\d+))f$"
options:NSRegularExpressionCaseInsensitive
error:&regexError];
if (!regexError) {
NSTextCheckingResult *match = [regex firstMatchInString:formatString
options:0
range:NSMakeRange(0, [formatString length])];
if (match) {
NSString *result = [formatString substringWithRange:match.range];
return result;
}
} else {
NSLog(@"error - %@", regexError);
error:nil];
NSTextCheckingResult *match = [regex firstMatchInString:formatString
options:0
range:NSMakeRange(0, [formatString length])];
if (match) {
NSString *result = [formatString substringWithRange:match.range];
return result;
}
return @"%f";
}
Expand Down
14 changes: 5 additions & 9 deletions Swift/FlickerNumber-Swift/UILabel+FlickerNumber.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,15 +438,11 @@ extension UILabel {
*/
fileprivate func regexNumberFormat(_ format: String) -> String {
let patternStr = "^%((\\d+.\\d+)|(\\d+).|(.\\d+))f$"
do {
let regex : NSRegularExpression = try NSRegularExpression(pattern: patternStr, options: .caseInsensitive)
let fRange = NSRange(location: 0, length: format.count)
if let match = regex.firstMatch(in: format, options: .reportProgress, range: fRange) {
let result = (format as NSString).substring(with: match.range)
return result
}
} catch {
print("Exception")
let regex = try! NSRegularExpression(pattern: patternStr, options: .caseInsensitive)
let fRange = NSRange(location: 0, length: format.count)
if let match = regex.firstMatch(in: format, options: .reportProgress, range: fRange) {
let result = (format as NSString).substring(with: match.range)
return result
}
return "%f"
}
Expand Down