Save object archive as pure dictionary, non-referential, remove objec…

…ts array
gnustep · Aug 31, 2024 · 0b1de36 · 0b1de36
1 parent 9244822
commit 0b1de36
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/XCode/NSObject+KeyExtraction.h b/XCode/NSObject+KeyExtraction.h
@@ -29,6 +29,7 @@
 + (NSArray *) skippedKeys;
 - (NSArray *) keysForObject: (id)object;
 - (NSDictionary *) recursiveKeysAndValuesForObject: (id)object;
+- (NSDictionary *) referentialArchive;
 - (NSDictionary *) allKeysAndValues;
 
 @end
diff --git a/XCode/NSObject+KeyExtraction.m b/XCode/NSObject+KeyExtraction.m
@@ -188,4 +188,18 @@ - (NSDictionary *) allKeysAndValues
   return [self recursiveKeysAndValuesForObject: self];
 }
 
+- (NSDictionary *) _recursivelyCreateReferentialArchive: (id)obj
+{
+}
+
+- (NSDictionary *) referentialArchive: (NSDictionary *)dict
+{
+  return dict;
+}
+
+- (NSDictionary *) referentialArchive
+{
+  return [self referentialArchive: [self allKeysAndValues]];
+}
+
 @end
diff --git a/XCode/PBXCoder.m b/XCode/PBXCoder.m
@@ -270,7 +270,8 @@ - (instancetype) initWithRootObject: (id)root
 
 - (id) archive
 {
-  return [_rootObject allKeysAndValues];
+  NSDictionary *plist = [_rootObject allKeysAndValues]; // referentialArchive];
+  return plist; //  [self _createReferenceBasedArchive: plist];
 }
 
 @end
diff --git a/XCode/PBXContainer.m b/XCode/PBXContainer.m
@@ -263,6 +263,10 @@ - (BOOL) save
 	   BOLD, YELLOW, [fn cString], RESET, GREEN,
 	   [dn cString], RESET);
 
+  // Clear the cached objects dictionary;
+  [self setObjects: [NSMutableDictionary dictionary]];
+
+  // Save the project...
   if (created && !error)
     {
       PBXCoder *coder = [[PBXCoder alloc] initWithRootObject: self];