Update to fix gcc errors

gnustep · Aug 16, 2024 · 7ea7e54 · 7ea7e54
1 parent da2d28c
commit 7ea7e54
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/XCode/NSObject+KeyExtraction.m b/XCode/NSObject+KeyExtraction.m
@@ -34,7 +34,7 @@ - (NSDictionary *) recursiveKeysAndValuesForObject: (id)object
 		  [arrayValues addObject: [self recursiveKeysAndValuesForObject: item]];
 		}
 
-	      keysAndValues[key] = arrayValues;
+	      [keysAndValues setObject: arrayValues forKey: key];
 	    }
 	  else if ([value isKindOfClass:[NSDictionary class]])
 	    {
@@ -45,16 +45,18 @@ - (NSDictionary *) recursiveKeysAndValuesForObject: (id)object
 	      while ((dictKey = [en nextObject]) != nil)
 		{
 		  id dictValue = [value objectForKey: dictKey];
-		  dictValues[dictKey] = [self recursiveKeysAndValuesForObject:dictValue];
+		  [dictValues setObject: [self recursiveKeysAndValuesForObject: dictValue]
+				 forKey: dictKey];
 		}
-	      keysAndValues[key] = dictValues;
+
+	      [keysAndValues setObject: dictValues forKey: key];
 	    }
 	  else if ([value isKindOfClass: [NSObject class]]
 		   && ![value isKindOfClass: [NSString class]]
 		   && ![value isKindOfClass:[NSNumber class]])
 	    {
-	      [keysAndValues setObject: [self recursiveKeysAndValuesForObject:value]
-	       forKey: key];
+	      [keysAndValues setObject: [self recursiveKeysAndValuesForObject: value]
+	                        forKey: key];
 	    }
 	  else
 	    {

diff --git a/XCode/PBXCoder.h b/XCode/PBXCoder.h
@@ -70,6 +70,9 @@
 
 - (instancetype) initWithRootObject: (id)obj;
 
+- (id) archive;
+
+- (id) archiveWithRootObject: (id)rootObject;
 
 
 @end
diff --git a/XCode/PBXCoder.m b/XCode/PBXCoder.m
@@ -97,7 +97,11 @@ - (void) dealloc
 
 - (id) unarchive
 {
-  return [self unarchiveFromDictionary: _dictionary];
+  id r = [self unarchiveFromDictionary: _dictionary];
+  NSLog(@"r = %@", r);
+  PBXCoder *newCoder = [[PBXCoder alloc] initWithRootObject: [r rootObject]];
+  NSLog(@"*** Archive = %@", [newCoder archive]);
+  return r;
 }
 
 - (id) unarchiveFromDictionary: (NSDictionary *)dict

diff --git a/XCode/PBXContainerItemProxy.m b/XCode/PBXContainerItemProxy.m
@@ -100,6 +100,9 @@ - (BOOL) build
       BOOL result = [container build];
       [mgr changeCurrentDirectoryPath: dir];
 
+      PBXCoder *newCoder = [[PBXCoder alloc] initWithRootObject: container];
+      NSLog(@"*** Archive = %@", [newCoder archive]);
+
       return result;
     }
   else

diff --git a/XCode/XCFileRef.m b/XCode/XCFileRef.m
@@ -124,6 +124,8 @@ - (NSArray *) targets
         {
 	  PBXContainer *pc = [coder unarchive];
 	  PBXProject *prj = [pc rootObject];
+	  PBXCoder *newCoder = [[PBXCoder alloc] initWithRootObject: pc];
+	  NSLog(@"*** Archive = %@", [newCoder archive]);
 
 	  result = [[prj targets] copy];
 	}
@@ -164,6 +166,9 @@ - (BOOL) performLegacyOperation: (SEL)sel
       if (coder != nil)
         {
           PBXContainer *pc = [coder unarchive];
+	  PBXCoder *newCoder = [[PBXCoder alloc] initWithRootObject: pc];
+	  NSLog(@"*** Archive = %@", [newCoder archive]);
+
 	  [pc setWorkspaceLink: _workspaceLink];
 	  [pc setWorkspaceIncludes: _workspaceIncludes];
 	  [pc setWorkspaceLibs: _workspaceLibs];