Update encoding for new NSFormatter subclasses

Headers/Foundation/NSMassFormatter.h

@@ -44,7 +44,7 @@ typedef NSInteger NSMassFormatterUnit;
 @class NSNumberFormatter;
 
 GS_EXPORT_CLASS
-@interface NSMassFormatter : NSObject
+@interface NSMassFormatter : NSFormatter
 {
   NSNumberFormatter *_numberFormatter;
   BOOL _isForPersonMassUse;

Source/NSByteCountFormatter.m

@@ -34,13 +34,15 @@
 
 #define	EXPOSE_NSByteCountFormatter_IVARS	1
 
-#import <Foundation/NSByteCountFormatter.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSAttributedString.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSError.h>
-#import <Foundation/NSLocale.h>
-#import <Foundation/NSValue.h>
+#import "Foundation/NSArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
+#import "Foundation/NSByteCountFormatter.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSAttributedString.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSError.h"
+#import "Foundation/NSLocale.h"
+#import "Foundation/NSValue.h"
 
 #define	GSInternal		NSByteCountFormatterInternal
 #include	"GSInternal.h"
@@ -318,5 +320,69 @@ - (void) setZeroPadsFractionDigits: (BOOL)flag
   internal->_zeroPadsFractionDigits = flag;
 }
 
-@end
+- (id) initWithCoder: (NSCoder *)coder
+{
+  if (nil == (self = [super init]))
+    {
+      return nil;
+    }
+
+  GS_CREATE_INTERNAL(NSByteCountFormatter);
+
+  if ([coder allowsKeyedCoding])
+    {
+      internal->_formattingContext = [coder decodeIntegerForKey: @"NSFormattingContext"];
+      internal->_countStyle = [coder decodeIntegerForKey: @"NSCountStyle"];
+      internal->_allowsNonnumericFormatting = !([coder decodeBoolForKey: @"NSNoNonnumeric"]);
+      internal->_includesActualByteCount = [coder decodeBoolForKey: @"NSIncludesActualByteCount"];
+      internal->_adaptive = !([coder decodeBoolForKey: @"NSNoAdaptive"]);
+      internal->_allowedUnits = [coder decodeIntegerForKey: @"NSAllowedUnits"];
+      internal->_includesCount = !([coder decodeBoolForKey: @"NSNoCount"]);
+      internal->_includesUnit = !([coder decodeBoolForKey: @"NSNoUnit"]);
+      internal->_zeroPadsFractionDigits = [coder decodeBoolForKey: @"NSZeroPad"];
+    }
+  else
+    {
+      [coder decodeValueOfObjCType: @encode(NSFormattingContext) at: &internal->_formattingContext];
+      [coder decodeValueOfObjCType: @encode(NSByteCountFormatterCountStyle) at: &internal->_countStyle];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &internal->_allowsNonnumericFormatting];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &internal->_includesActualByteCount];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &internal->_adaptive];
+      [coder decodeValueOfObjCType: @encode(NSByteCountFormatterUnits) at: &internal->_allowedUnits];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &internal->_includesCount];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &internal->_includesUnit];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &internal->_zeroPadsFractionDigits];
+    }
+
+  return self;
+}
 
+- (void) encodeWithCoder: (NSCoder *)coder
+{
+  if ([coder allowsKeyedCoding])
+    {
+      [coder encodeInteger: internal->_formattingContext forKey: @"NSFormattingContext"];
+      [coder encodeInteger: internal->_countStyle forKey: @"NSCountStyle"];
+      [coder encodeBool: !(internal->_allowsNonnumericFormatting) forKey: @"NSNoNonnumeric"];
+      [coder encodeBool: internal->_includesActualByteCount forKey: @"NSIncludesActualByteCount"];
+      [coder encodeBool: !(internal->_adaptive) forKey: @"NSNoAdaptive"];
+      [coder encodeInteger: internal->_allowedUnits forKey: @"NSAllowedUnits"];
+      [coder encodeBool: !(internal->_includesCount) forKey: @"NSNoCount"];
+      [coder encodeBool: !(internal->_includesUnit) forKey: @"NSNoUnit"];
+      [coder encodeBool: internal->_zeroPadsFractionDigits forKey: @"NSZeroPad"];
+    }
+  else
+    {
+      [coder encodeValueOfObjCType: @encode(NSFormattingContext) at: &internal->_formattingContext];
+      [coder encodeValueOfObjCType: @encode(NSByteCountFormatterCountStyle) at: &internal->_countStyle];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &internal->_allowsNonnumericFormatting];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &internal->_includesActualByteCount];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &internal->_adaptive];
+      [coder encodeValueOfObjCType: @encode(NSByteCountFormatterUnits) at: &internal->_allowedUnits];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &internal->_includesCount];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &internal->_includesUnit];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &internal->_zeroPadsFractionDigits];
+    }
+}
+
+@end

Source/NSDateComponentsFormatter.m

@@ -21,6 +21,8 @@
    Software Foundation, Inc., 31 Milk Street #960789 Boston, MA 02196 USA.
 */
 
+#import "Foundation/NSArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
 #import "Foundation/NSDateComponentsFormatter.h"
 #import "Foundation/NSDate.h"
 #import "Foundation/NSString.h"
@@ -60,15 +62,65 @@ - (instancetype) initWithCoder: (NSCoder *)coder
   self = [super initWithCoder: coder];
   if (self != nil)
     {
-      // TODO: Implement coding...
+      if ([coder allowsKeyedCoding])
+        {
+          ASSIGN(_calendar, [coder decodeObjectForKey: @"NS.calendar"]);
+          ASSIGN(_referenceDate, [coder decodeObjectForKey: @"referenceDate"]);
+          _allowsFractionalUnits = [coder decodeBoolForKey: @"allowsFractionalUnits"];
+          _collapsesLargestUnit = [coder decodeBoolForKey: @"collapsesLargestUnit"];
+          _includesApproximationPhrase = [coder decodeBoolForKey: @"includesApproximationPhrase"];
+          _formattingContext = [coder decodeIntegerForKey: @"formattingContext"];
+          _maximumUnitCount = [coder decodeIntegerForKey: @"maximumUnitCount"];
+          _zeroFormattingBehavior = [coder decodeIntegerForKey: @"zeroFormattingBehavior"];
+          _allowedUnits = [coder decodeIntegerForKey: @"NS.allowedUnits"];
+          _unitsStyle = [coder decodeIntegerForKey: @"NS.unitsStyle"];
+        }
+      else
+        {
+          [coder decodeValueOfObjCType: @encode(id) at: &_calendar];
+          [coder decodeValueOfObjCType: @encode(id) at: &_referenceDate];
+          [coder decodeValueOfObjCType: @encode(BOOL) at: &_allowsFractionalUnits];
+          [coder decodeValueOfObjCType: @encode(BOOL) at: &_collapsesLargestUnit];
+          [coder decodeValueOfObjCType: @encode(BOOL) at: &_includesApproximationPhrase];
+          [coder decodeValueOfObjCType: @encode(NSFormattingContext) at: &_formattingContext];
+          [coder decodeValueOfObjCType: @encode(NSInteger) at: &_maximumUnitCount];
+          [coder decodeValueOfObjCType: @encode(NSDateComponentsFormatterZeroFormattingBehavior) at: &_zeroFormattingBehavior];
+          [coder decodeValueOfObjCType: @encode(NSCalendarUnit) at: &_allowedUnits];
+          [coder decodeValueOfObjCType: @encode(NSDateComponentsFormatterUnitsStyle) at: &_unitsStyle];
+        }
     }
   return self;
 }
 
 - (void) encodeWithCoder: (NSCoder *)coder
 {
   [super encodeWithCoder: coder];
-  // TODO: Implement coding...
+  if ([coder allowsKeyedCoding])
+    {
+      [coder encodeObject: _calendar forKey: @"NS.calendar"];
+      [coder encodeObject: _referenceDate forKey: @"referenceDate"];
+      [coder encodeBool: _allowsFractionalUnits forKey: @"allowsFractionalUnits"];
+      [coder encodeBool: _collapsesLargestUnit forKey: @"collapsesLargestUnit"];
+      [coder encodeBool: _includesApproximationPhrase forKey: @"includesApproximationPhrase"];
+      [coder encodeInteger: _formattingContext forKey: @"formattingContext"];
+      [coder encodeInteger: _maximumUnitCount forKey: @"maximumUnitCount"];
+      [coder encodeInteger: _zeroFormattingBehavior forKey: @"zeroFormattingBehavior"];
+      [coder encodeInteger: _allowedUnits forKey: @"NS.allowedUnits"];
+      [coder encodeInteger: _unitsStyle forKey: @"NS.unitsStyle"];
+    }
+  else
+    {
+      [coder encodeValueOfObjCType: @encode(id) at: &_calendar];
+      [coder encodeValueOfObjCType: @encode(id) at: &_referenceDate];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &_allowsFractionalUnits];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &_collapsesLargestUnit];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &_includesApproximationPhrase];
+      [coder encodeValueOfObjCType: @encode(NSFormattingContext) at: &_formattingContext];
+      [coder encodeValueOfObjCType: @encode(NSInteger) at: &_maximumUnitCount];
+      [coder encodeValueOfObjCType: @encode(NSDateComponentsFormatterZeroFormattingBehavior) at: &_zeroFormattingBehavior];
+      [coder encodeValueOfObjCType: @encode(NSCalendarUnit) at: &_allowedUnits];
+      [coder encodeValueOfObjCType: @encode(NSDateComponentsFormatterUnitsStyle) at: &_unitsStyle];
+    }
 }
 
 - (void) dealloc

Source/NSDateIntervalFormatter.m

@@ -21,6 +21,8 @@
    Software Foundation, Inc., 31 Milk Street #960789 Boston, MA 02196 USA.
 */
 
+#import "Foundation/NSArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
 #import "Foundation/NSDateIntervalFormatter.h"
 #import "Foundation/NSLocale.h"
 #import "Foundation/NSCalendar.h"
@@ -110,5 +112,55 @@ - (NSString *) stringFromDateInterval: (NSDateInterval *)dateInterval
   return [NSString stringWithFormat: @"%@ - %@", fromDate, toDate];
 }
 
+- (instancetype) initWithCoder: (NSCoder *)coder
+{
+  self = [super initWithCoder: coder];
+  if (self != nil)
+    {
+      if ([coder allowsKeyedCoding])
+        {
+          ASSIGN(_locale, [coder decodeObjectForKey: @"NS.locale"]);
+          ASSIGN(_calendar, [coder decodeObjectForKey: @"NS.calendar"]);
+          ASSIGN(_timeZone, [coder decodeObjectForKey: @"NS.timeZone"]);
+          ASSIGN(_dateTemplate, [coder decodeObjectForKey: @"NS.dateTemplate"]);
+          _dateStyle = [coder decodeIntegerForKey: @"NS.dateStyle"];
+          _timeStyle = [coder decodeIntegerForKey: @"NS.timeStyle"];
+        }
+      else
+        {
+          [coder decodeValueOfObjCType: @encode(id) at: &_locale];
+          [coder decodeValueOfObjCType: @encode(id) at: &_calendar];
+          [coder decodeValueOfObjCType: @encode(id) at: &_timeZone];
+          [coder decodeValueOfObjCType: @encode(id) at: &_dateTemplate];
+          [coder decodeValueOfObjCType: @encode(NSDateIntervalFormatterStyle) at: &_dateStyle];
+          [coder decodeValueOfObjCType: @encode(NSDateIntervalFormatterStyle) at: &_timeStyle];
+        }
+    }
+  return self;
+}
+
+- (void) encodeWithCoder: (NSCoder *)coder
+{
+  [super encodeWithCoder: coder];
+  if ([coder allowsKeyedCoding])
+    {
+      [coder encodeObject: _locale forKey: @"NS.locale"];
+      [coder encodeObject: _calendar forKey: @"NS.calendar"];
+      [coder encodeObject: _timeZone forKey: @"NS.timeZone"];
+      [coder encodeObject: _dateTemplate forKey: @"NS.dateTemplate"];
+      [coder encodeInteger: _dateStyle forKey: @"NS.dateStyle"];
+      [coder encodeInteger: _timeStyle forKey: @"NS.timeStyle"];
+    }
+  else
+    {
+      [coder encodeValueOfObjCType: @encode(id) at: &_locale];
+      [coder encodeValueOfObjCType: @encode(id) at: &_calendar];
+      [coder encodeValueOfObjCType: @encode(id) at: &_timeZone];
+      [coder encodeValueOfObjCType: @encode(id) at: &_dateTemplate];
+      [coder encodeValueOfObjCType: @encode(NSDateIntervalFormatterStyle) at: &_dateStyle];
+      [coder encodeValueOfObjCType: @encode(NSDateIntervalFormatterStyle) at: &_timeStyle];
+    }
+}
+
 @end
 

Source/NSEnergyFormatter.m

@@ -21,6 +21,8 @@
    Software Foundation, Inc., 31 Milk Street #960789 Boston, MA 02196 USA.
 */
 
+#import "Foundation/NSArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
 #import "Foundation/NSEnergyFormatter.h"
 #import "Foundation/NSMeasurement.h"
 #import "Foundation/NSMeasurementFormatter.h"
@@ -125,5 +127,43 @@ - (BOOL) getObjectValue: (id *)obj forString: (NSString *)string errorDescriptio
   return NO;
 }
 
+- (instancetype) initWithCoder: (NSCoder *)coder
+{
+  self = [super initWithCoder: coder];
+  if (self != nil)
+    {
+      if ([coder allowsKeyedCoding])
+        {
+          _isForFoodEnergyUse = [coder decodeBoolForKey: @"NS.forFoodEnergyUse"];
+          ASSIGN(_numberFormatter, [coder decodeObjectForKey: @"NS.numberFormatter"]);
+          _unitStyle = [coder decodeIntegerForKey: @"NS.unitOptions"];
+        }
+      else
+        {
+          [coder decodeValueOfObjCType: @encode(BOOL) at: &_isForFoodEnergyUse];
+          [coder decodeValueOfObjCType: @encode(id) at: &_numberFormatter];
+          [coder decodeValueOfObjCType: @encode(NSFormattingUnitStyle) at: &_unitStyle];
+        }
+    }
+  return self;
+}
+
+- (void) encodeWithCoder: (NSCoder *)coder
+{
+  [super encodeWithCoder: coder];
+  if ([coder allowsKeyedCoding])
+    {
+      [coder encodeBool: _isForFoodEnergyUse forKey: @"NS.forFoodEnergyUse"];
+      [coder encodeObject: _numberFormatter forKey: @"NS.numberFormatter"];
+      [coder encodeInteger: _unitStyle forKey: @"NS.unitOptions"];
+    }
+  else
+    {
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &_isForFoodEnergyUse];
+      [coder encodeValueOfObjCType: @encode(id) at: &_numberFormatter];
+      [coder encodeValueOfObjCType: @encode(NSFormattingUnitStyle) at: &_unitStyle];
+    }
+}
+
 @end
 

Source/NSISO8601DateFormatter.m

@@ -149,6 +149,7 @@ - (id) initWithCoder: (NSCoder *)decoder
 {
   if ((self = [super init]) != nil)
     {
+      _formatter = [[NSDateFormatter alloc] init];
       if ([decoder allowsKeyedCoding])
         {
           ASSIGN(_timeZone, [decoder decodeObjectForKey: @"NS.timeZone"]);

Source/NSLengthFormatter.m

@@ -21,6 +21,8 @@
    Software Foundation, Inc., 31 Milk Street #960789 Boston, MA 02196 USA.
 */
 
+#import "Foundation/NSArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
 #import "Foundation/NSLengthFormatter.h"
 #import "Foundation/NSMeasurement.h"
 #import "Foundation/NSMeasurementFormatter.h"
@@ -155,4 +157,42 @@ - (BOOL) getObjectValue: (id *)obj forString: (NSString *)string errorDescriptio
   return NO;
 }
 
+- (instancetype) initWithCoder: (NSCoder *)coder
+{
+  self = [super initWithCoder: coder];
+  if (self != nil)
+    {
+      if ([coder allowsKeyedCoding])
+        {
+          _isForPersonHeightUse = [coder decodeBoolForKey: @"NS.forPersonHeightUse"];
+          ASSIGN(_numberFormatter, [coder decodeObjectForKey: @"NS.numberFormatter"]);
+          _unitStyle = [coder decodeIntegerForKey: @"NS.unitStyle"];
+        }
+      else
+        {
+          [coder decodeValueOfObjCType: @encode(BOOL) at: &_isForPersonHeightUse];
+          [coder decodeValueOfObjCType: @encode(id) at: &_numberFormatter];
+          [coder decodeValueOfObjCType: @encode(NSFormattingUnitStyle) at: &_unitStyle];
+        }
+    }
+  return self;
+}
+
+- (void) encodeWithCoder: (NSCoder *)coder
+{
+  [super encodeWithCoder: coder];
+  if ([coder allowsKeyedCoding])
+    {
+      [coder encodeBool: _isForPersonHeightUse forKey: @"NS.forPersonHeightUse"];
+      [coder encodeObject: _numberFormatter forKey: @"NS.numberFormatter"];
+      [coder encodeInteger: _unitStyle forKey: @"NS.unitStyle"];
+    }
+  else
+    {
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &_isForPersonHeightUse];
+      [coder encodeValueOfObjCType: @encode(id) at: &_numberFormatter];
+      [coder encodeValueOfObjCType: @encode(NSFormattingUnitStyle) at: &_unitStyle];
+    }
+}
+
 @end