From c53ec5520e39096e0804ce8d89a21378c0904481 Mon Sep 17 00:00:00 2001
From: thomasvl <thomasvl@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>
Date: Fri, 13 Jun 2008 19:21:50 +0000
Subject: Landing a log of AppleScript/AppleEvent support code. Landing
 GTMHTTPServer as a simple server but mainly for use in unittesting.
 _GTMCompileAssert for doing compile time assertions to GTMDefines.h Lots of
 improvments for UnitTesting, Dave's gonna put up a wiki page shortly with the
 full details of what can be done.

---
 Foundation/GTMRegex.m | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'Foundation/GTMRegex.m')

diff --git a/Foundation/GTMRegex.m b/Foundation/GTMRegex.m
index 92eb576..f183553 100644
--- a/Foundation/GTMRegex.m
+++ b/Foundation/GTMRegex.m
@@ -228,7 +228,7 @@ static NSString *const kReplacementPattern =
 
   // make sure the match is the full string
   return (regMatch.rm_so == 0) &&
-    (regMatch.rm_eo == [str lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
+    (regMatch.rm_eo == (regoff_t)[str lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
 }
 
 - (NSArray *)subPatternsOfString:(NSString *)str {
@@ -252,7 +252,7 @@ static NSString *const kReplacementPattern =
 
     // make sure the match is the full string
     if ((regMatches[0].rm_so != 0) ||
-        (regMatches[0].rm_eo != [str lengthOfBytesUsingEncoding:NSUTF8StringEncoding])) {
+        (regMatches[0].rm_eo != (regoff_t)[str lengthOfBytesUsingEncoding:NSUTF8StringEncoding])) {
       // only matched a sub part of the string
       return nil;
     }
@@ -551,7 +551,7 @@ static NSString *const kReplacementPattern =
       isMatch = YES; // if we have something saved, it was a pattern match
     }
     // have we reached the end?
-    else if (curParseIndex_ >= [utf8StrBuf_ length]) {
+    else if (curParseIndex_ >= (regoff_t)[utf8StrBuf_ length]) {
       // done, do nothing, we'll return nil
     }
     // do the search.
@@ -697,17 +697,20 @@ static NSString *const kReplacementPattern =
   return [self subPatternString:0];
 }
 
-- (NSString *)subPatternString:(NSUInteger)index {
-  if ((index < 0) || (index > numRegMatches_))
+- (NSString *)subPatternString:(NSUInteger)patternIndex {
+  if (patternIndex > numRegMatches_)
     return nil;
 
   // pick off when it wasn't found
-  if ((regMatches_[index].rm_so == -1) && (regMatches_[index].rm_eo == -1))
+  if ((regMatches_[patternIndex].rm_so == -1) && 
+      (regMatches_[patternIndex].rm_eo == -1))
     return nil;
 
   // fetch the string
-  const char *base = (const char*)[utf8StrBuf_ bytes] + regMatches_[index].rm_so;
-  regoff_t len = regMatches_[index].rm_eo - regMatches_[index].rm_so;
+  const char *base = (const char*)[utf8StrBuf_ bytes] 
+    + regMatches_[patternIndex].rm_so;
+  regoff_t len = regMatches_[patternIndex].rm_eo 
+    - regMatches_[patternIndex].rm_so;
   return [[[NSString alloc] initWithBytes:base
                                    length:(NSUInteger)len
                                  encoding:NSUTF8StringEncoding] autorelease];
@@ -748,7 +751,7 @@ static NSString *const kReplacementPattern =
   isMatch_ = isMatch;
 
   // check the args
-  if (!utf8StrBuf_ || !regMatches_ || (numRegMatches_ < 0)) {
+  if (!utf8StrBuf_ || !regMatches_) {
     // COV_NF_START
     // this could only happen something messed w/ our internal state.
     [self release];
-- 
cgit v1.2.3