Objective-C refresh.

Author: NeilFraser

.gitignore

@@ -4,5 +4,8 @@
 *.pyc
 *.komodoproject
 
+.DS_STORE
+xcuserdata
+
 dart/tests/Speedtest.dart.js.deps
 dart/tests/Speedtest.dart.js.map

objectivec/Configurations/Base+SnowLeopard.xcconfig

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

objectivec/Configurations/Base.xcconfig

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>de.geheimwerk.${PRODUCT_NAME:rfc1034Identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

objectivec/Configurations/Version.xcconfig

@@ -31,15 +31,14 @@ @implementation NSString (UriCompatibility)
  * @param str The CFStringRef to escape.
  * @return The escaped CFStringRef.
  */
-- (NSString *)diff_stringByAddingPercentEscapesForEncodeUriCompatibility;
-{
-  CFStringRef urlString = CFURLCreateStringByAddingPercentEscapes(NULL,
-                                  (CFStringRef)self,
-                                  CFSTR(" !~*'();/?:@&=+$,#"),
-                                  NULL,
-                                  kCFStringEncodingUTF8);
-  CFMakeCollectable(urlString);
-  return [(NSString *)urlString autorelease];
+- (NSString *)diff_stringByAddingPercentEscapesForEncodeUriCompatibility {
+  NSMutableCharacterSet *allowedCharacters =
+      [NSMutableCharacterSet characterSetWithCharactersInString:@" !~*'();/?:@&=+$,#"];
+  [allowedCharacters formUnionWithCharacterSet:[NSCharacterSet URLQueryAllowedCharacterSet]];
+  NSString *URLString =
+      [self stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacters];
+
+  return URLString;
 }
 
 /**
@@ -49,14 +48,9 @@ - (NSString *)diff_stringByAddingPercentEscapesForEncodeUriCompatibility;
  *
  * @return The unescaped NSString.
  */
-- (NSString *)diff_stringByReplacingPercentEscapesForEncodeUriCompatibility;
-{
-  CFStringRef decodedString = CFURLCreateStringByReplacingPercentEscapesUsingEncoding(NULL, 
-                                            (CFStringRef)self, 
-                                            CFSTR(""), 
-                                            kCFStringEncodingUTF8);
-  CFMakeCollectable(decodedString);
-  return [(NSString *)decodedString autorelease];
+- (NSString *)diff_stringByReplacingPercentEscapesForEncodeUriCompatibility {
+  NSString *decodedString = [self stringByRemovingPercentEncoding];
+  return decodedString;
 }
 
 @end

objectivec/DiffMatchPatch.xcodeproj/project.pbxproj

@@ -3,19 +3,19 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

objectivec/DiffMatchPatch.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -19,13 +19,9 @@
  * ObjC port: jan@geheimwerk.de (Jan Weiß)
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import "DiffMatchPatch.h"
 
-
-@interface DiffMatchPatchTest : SenTestCase {
-
-}
-
+@interface DiffMatchPatchTest : XCTestCase
 @end

objectivec/DiffMatchPatch.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -26,11 +26,20 @@
 int main (int argc, const char * argv[]) {
   NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 
-  NSString *text1 = [NSString stringWithContentsOfFile:@"Speedtest1.txt"
+  NSString *directory = @"";
+  if (argc >= 1) {
+     directory = [NSString stringWithCString:argv[1] encoding:NSUTF8StringEncoding];
+  }
+
+  NSString *filePath1 =
+      [directory stringByAppendingPathComponent:@"Tests/Speedtest1.txt"];
+  NSString *text1 = [NSString stringWithContentsOfFile:filePath1
                         encoding:NSUTF8StringEncoding
                            error:NULL];
 
-  NSString *text2 = [NSString stringWithContentsOfFile:@"Speedtest2.txt"
+  NSString *filePath2 =
+      [directory stringByAppendingPathComponent:@"Tests/Speedtest2.txt"];
+  NSString *text2 = [NSString stringWithContentsOfFile:filePath2
                         encoding:NSUTF8StringEncoding
                            error:NULL];