Apply changes from PR #74

Author: qmathe

Core/COCrossPersistentRootDeadRelationshipCache.h

@@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * For referring object graph contexts, when unloaded or finalized, the
  * deallocation will trigger their removal of their inner objects from the hash 
- * tables in the cache on 10.8 or iOS 6 or higher, but not on 10.7.
+ * tables in the cache on 10.8 or iOS 6 or higher, which we require.
  */
 - (void)removePath: (COPath *)aPath;
 

Core/COCrossPersistentRootDeadRelationshipCache.m

@@ -16,11 +16,7 @@ - (instancetype)init
 {
     SUPERINIT;
     _pathToReferringObjects = [NSMutableDictionary new];
-#if GNUSTEP
-    _referringObjectToPaths = [NSMapTable mapTableWithWeakToStrongObjects];
-#else
     _referringObjectToPaths = [NSMapTable weakToStrongObjectsMapTable];
-#endif
     return self;
 }
 
@@ -35,11 +31,7 @@ - (void)addReferringObject: (COObject *)aReferrer
         // FIXME: If we don't ditch 10.7 support, we need a reverse mapping
         // from each referringObject to a path set, that can be used to remove
         // the referring objects when their object graph context is discarded.
-#ifdef GNUSTEP
-        referringObjects = [NSHashTable hashTableWithWeakObjects];
-#else
         referringObjects = [NSHashTable weakObjectsHashTable];
-#endif
 
         _pathToReferringObjects[aPath] = referringObjects;
     }

Core/COPrimitiveCollection.m

@@ -83,11 +83,7 @@ - (BOOL)isMutable
 
 - (NSPointerArray *)makeBacking
 {
-#ifdef GNUSTEP
-    return [NSPointerArray pointerArrayWithStrongObjects];
-#else
     return [NSPointerArray strongObjectsPointerArray];
-#endif
 }
 
 - (instancetype)init
@@ -250,7 +246,7 @@ - (void)insertObject: (id)anObject atIndex: (NSUInteger)index
     COThrowExceptionIfNotMutable(_permanentlyMutable, _temporaryMutable);
     COThrowExceptionIfOutOfBounds(self, index, YES);
 
-    // NSPointerArray on 10.7 doesn't allow inserting at the end using index == count, so
+    // NSPointerArray on 10.9 (at least) doesn't allow inserting at the end using index == count, so
     // call addPointer in that case as a workaround.
     if (index == _externalIndexToBackingIndex.count)
     {
@@ -366,20 +362,12 @@ @implementation COUnsafeRetainedMutableArray
 
 - (NSPointerArray *)makeBacking
 {
-#ifdef GNUSTEP
-    return [NSPointerArray pointerArrayWithWeakObjects];
-#else
     return [NSPointerArray weakObjectsPointerArray];
-#endif
 }
 
 - (NSHashTable *)makeBackingHashTable
 {
-#ifdef GNUSTEP
-    return [NSHashTable hashTableWithWeakObjects];
-#else
     return [NSHashTable weakObjectsHashTable];
-#endif
 }
 
 - (instancetype)initWithObjects: (const id[])objects count: (NSUInteger)count
@@ -672,11 +660,7 @@ @implementation COUnsafeRetainedMutableSet
 
 - (NSHashTable *)makeBacking
 {
-#ifdef GNUSTEP
-    return [NSHashTable hashTableWithWeakObjects];
-#else
     return [NSHashTable weakObjectsHashTable];
-#endif
 }
 
 @end

Debugging/COSQLiteStore+Graphviz.m

@@ -178,12 +178,9 @@ void COViewDOTGraphFile(NSString *dotFilePath)
         {
             continue;
         }
-
-        // NOTE: Using NSTask rather than system() breaks 'po [objectGraphContext showGraph]' in LLDB on 10.7 
-        system([[NSString stringWithFormat: @"%@ -Tpdf '%@' -o '%@'",
-                                            executablePath,
-                                            dotFilePath,
-                                            pdfPath] UTF8String]);
+        NSTask *task = [NSTask launchedTaskWithLaunchPath: executablePath
+                                                arguments: @[@"-Tpdf", dotFilePath, @"-o", pdfPath]];
+        [task waitUntilExit];
         [[NSWorkspace sharedWorkspace] openFile: pdfPath];
         break;
     }

StorageDataModel/COItem+JSON.m

@@ -167,22 +167,6 @@ static id plistValueForValue(id aValue, COType aType)
 
 // JSON-compatible plist -> COItem attribute value
 
-/* 
- * Returning the parsed value as a NSNumber rather a NSDecimalNumber to ensure 
- * the rounding is the same than the serialized NSNumber object.
- *
- * Without this workaround, 123.456789012 roundtrip doesn't succeed on 10.7 (see
- * -testJSONDoubleEquality in TestItem.m)).
- *
- * For 123.456789012, NSJSONSerialization returns a NSDecimalNumber, but the 
- * rounding doesn't produce the same internal representation than a NSNumber 
- * initialized with the same double value.
- */
-static inline NSNumber *basicNumberFromDecimalNumber(NSNumber *aValue)
-{
-    return @(aValue.description.doubleValue);
-}
-
 static id valueForPrimitivePlistValue(id aValue, COType aType)
 {
     if (aValue == [NSNull null])
@@ -195,7 +179,7 @@ static id valueForPrimitivePlistValue(id aValue, COType aType)
         case kCOTypeInt64:
             return aValue;
         case kCOTypeDouble:
-            return basicNumberFromDecimalNumber(aValue);
+            return aValue;
         case kCOTypeString:
             return aValue;
         case kCOTypeAttachment:

Tests/StorageDataModel/TestItem.m

@@ -82,16 +82,13 @@ - (void)testJSONDoubleEquality
     NSNumber *newValueFromDesc = @(roundTripValue.description.doubleValue);
 
 #ifndef GNUSTEP
-    // NOTE: Doesn't matter on GNUstep since newValue is not a NSDecimalNumber, 
-    // and we don't have to convert it into a NSDoubleNumber (unlike on 10.7).
+    // NOTE: Doesn't matter on GNUstep since newValue is not a NSDecimalNumber.
     UKTrue([[NSDecimalNumber defaultBehavior] scale] == NSDecimalNoScale);
 #endif
 
     NSLog(@"Double representation in JSON: %@",
           [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding]);
 
-    /* Rounding is visible in the ouput for numbers that contain more than two 
-       decimals on 10.7 (e.g. 123.45 output is the same for all numbers). */
     NSLog(@"value            doubleValue: %.20f, description: %@, class: %@",
           value.doubleValue, value, [value class]);
     NSLog(@"decimalValue     doubleValue: %.20f, description: %@, class: %@",

Tests/TestCommon.m

@@ -91,8 +91,6 @@ - (instancetype)init
 - (void)dealloc
 {
 #ifdef DELETE_STORE_AFTER_EACH_TEST_METHOD
-    // FIXME: For Mac OS X 10.7, this is unsupported, SQLite disk errors
-    // (DB Error: 10 "disk I/O error") appear in TestStoreSQLite.m.
     [[self class] deleteStores];
 #endif
 }

Undo/COUndoTrackStore+Private.h

@@ -11,22 +11,22 @@
 @class FMDatabase;
 @class ETUUID;
 
-NSString *const COUndoTrackStoreTrackDidChangeNotification;
+extern NSString *const COUndoTrackStoreTrackDidChangeNotification;
 
 // User info keys for COUndoTrackStoreTrackDidChangeNotification
-NSString *const COUndoTrackStoreTrackName;
+extern NSString *const COUndoTrackStoreTrackName;
 /**
  * UUID string
  */
-NSString *const COUndoTrackStoreTrackHeadCommandUUID;
+extern NSString *const COUndoTrackStoreTrackHeadCommandUUID;
 /**
  * NSNull or UUID string
  */
-NSString *const COUndoTrackStoreTrackCurrentCommandUUID;
+extern NSString *const COUndoTrackStoreTrackCurrentCommandUUID;
 /**
  * NSNumber boolean
  */
-NSString *const COUndoTrackStoreTrackCompacted;
+extern NSString *const COUndoTrackStoreTrackCompacted;
 
 @interface COUndoTrackSerializedCommand : NSObject