Handled the usage of RegexKitLite in ARC environment (simply turned o…

…ff ARC when compiling the RegexKitLite source), then removed the conditional compilation for qualifies in the PKPattern class.
j0hnds · Oct 24, 2012 · 3f8715b · 3f8715b
1 parent 10a40f2
commit 3f8715b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/ParseKit.xcodeproj/project.pbxproj b/ParseKit.xcodeproj/project.pbxproj
@@ -531,7 +531,7 @@
 		D3FD79210F4CC87900BAD816 /* rubyhash.grammar in Resources */ = {isa = PBXBuildFile; fileRef = D3FD791F0F4CC86800BAD816 /* rubyhash.grammar */; };
 		D3FDC4A50FFB3B2A00F1F797 /* RegexKitLite.h in Headers */ = {isa = PBXBuildFile; fileRef = D36C55FC0FD3617B00141CB7 /* RegexKitLite.h */; };
 		D3FDC6DA0FFC4C8C00F1F797 /* RegexKitLite.h in Headers */ = {isa = PBXBuildFile; fileRef = D36C55FC0FD3617B00141CB7 /* RegexKitLite.h */; };
-		D3FDC6EE0FFC4C9E00F1F797 /* RegexKitLite.m in Sources */ = {isa = PBXBuildFile; fileRef = D36C55FD0FD3617B00141CB7 /* RegexKitLite.m */; };
+		D3FDC6EE0FFC4C9E00F1F797 /* RegexKitLite.m in Sources */ = {isa = PBXBuildFile; fileRef = D36C55FD0FD3617B00141CB7 /* RegexKitLite.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		D3FDC6EF0FFC4C9E00F1F797 /* PKReader.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAD9B0FF9C95800D7773A /* PKReader.m */; };
 		D3FDC6F00FFC4C9E00F1F797 /* PKAssembly.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BADA00FF9C9B000D7773A /* PKAssembly.m */; };
 		D3FDC6F10FFC4C9E00F1F797 /* PKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BADD60FF9CBFB00D7773A /* PKParser.m */; };
@@ -3777,6 +3777,7 @@
 				554BD2E916372F81003DA169 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
 		};
 		D33494150E2963FE00406085 /* Build configuration list for PBXNativeTarget "DemoApp" */ = {
 			isa = XCConfigurationList;

diff --git a/src/PKPattern.m b/src/PKPattern.m
@@ -45,15 +45,11 @@ - (id)initWithString:(NSString *)s options:(PKPatternOptions)opts {
 
 
 - (BOOL)qualifies:(id)obj {
-#if __has_feature(objc_arc)
-    return FALSE;
-#else
     PKToken *tok = (PKToken *)obj;
 
     NSRange r = NSMakeRange(0, [tok.stringValue length]);
 
     return NSEqualRanges(r, [tok.stringValue rangeOfRegex:self.string options:(uint32_t)options inRange:r capture:0 error:nil]);
-#endif
 }
 
 @end
diff --git a/src/RegexKitLite.h b/src/RegexKitLite.h
@@ -36,8 +36,6 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#if !__has_feature(objc_arc)
-
 #ifdef    __OBJC__
 #import <Foundation/NSArray.h>
 #import <Foundation/NSError.h>
@@ -220,5 +218,3 @@ extern NSString * const RKLICURegexRegexOptionsErrorKey;
 #ifdef __cplusplus
 }  // extern "C"
 #endif
-
-#endif // __has_feature(objc_arc)
diff --git a/src/RegexKitLite.m b/src/RegexKitLite.m
@@ -35,7 +35,6 @@
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#if !__has_feature(objc_arc)
 
 #include <CoreFoundation/CFBase.h>
 #include <CoreFoundation/CFArray.h>
@@ -1634,4 +1633,3 @@ - (NSUInteger)RKL_METHOD_PREPEND(replaceOccurrencesOfRegex):(NSString *)regex wi
 
 @end
 
-#endif // __has_feature(objc_arc)