Skip to content

Update format arguments such that they are suitable for NSInteger/NSUInteger #7

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
tonyarnold wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update format arguments such that they are suitable for NSInteger/NSUInteger #7

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
10 changes: 5 additions & 5 deletions WTReTextField/WTReParser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,16 @@ - (NSString*)displayQuantifier
} else if (_countTo == 1) {
pat = @"?";
} else {
pat = [NSString stringWithFormat:@"{,%u}", _countTo];
pat = [NSString stringWithFormat:@"{,%tu}", _countTo];
}
} else if (_countFrom == 1 && _countTo == NSUIntegerMax) {
pat = @"+";
} else if (_countFrom == _countTo) {
pat = [NSString stringWithFormat:@"{%u}", _countFrom];
pat = [NSString stringWithFormat:@"{%tu}", _countFrom];
} else if (_countTo == NSUIntegerMax) {
pat = [NSString stringWithFormat:@"{%u,}", _countFrom];
pat = [NSString stringWithFormat:@"{%tu,}", _countFrom];
} else {
pat = [NSString stringWithFormat:@"{%u,%u}", _countFrom, _countTo];
pat = [NSString stringWithFormat:@"{%tu,%tu}", _countFrom, _countTo];
}

if (_greedy) return pat;
Expand Down Expand Up @@ -508,7 +508,7 @@ - (BOOL)isValidEscapedChar:(unichar)c inCharset:(BOOL)inCharset
- (void)raiseParserError:(NSString*)error atPos:(NSUInteger)pos
{
NSString *pat = [NSString stringWithFormat:@"%@ \u25B6%@", [_pattern substringToIndex:pos], [_pattern substringFromIndex:pos]];
@throw [NSException exceptionWithName:@"Parse error" reason:[NSString stringWithFormat:@"%@ @ pos %d: %@", error, pos, pat] userInfo:nil];
@throw [NSException exceptionWithName:@"Parse error" reason:[NSString stringWithFormat:@"%@ @ pos %zd: %@", error, pos, pat] userInfo:nil];
}

- (WTReCharacterBase*)parseCharset:(NSString*)pattern inRange:(NSRange)range enclosed:(BOOL)enclosed
Expand Down