mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
fixed buggy encoder/decoder and code cleanup.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@11493 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
1e832570a4
commit
32ba6c6a51
2 changed files with 24 additions and 55 deletions
|
@ -1,3 +1,7 @@
|
|||
2001-11-23 Laurent Julliard <laurent@julliard-online.org>
|
||||
|
||||
* Source/NSNumberFormatter.m (-encodeWithCoder:, -initWithCode:): fixed buggy encoder and decoder and code cleanup.
|
||||
|
||||
2001-11-22 Laurent Julliard <Laurent.Julliard@xrce.xerox.com>
|
||||
|
||||
* Headers/gnustep/base/Foundation.h: Fixed NSNumberFormatter.h missing.
|
||||
|
|
|
@ -116,30 +116,17 @@
|
|||
[encoder encodeValueOfObjCType: @encode(unichar) at: &_thousandSeparator];
|
||||
[encoder encodeValueOfObjCType: @encode(unichar) at: &_decimalSeparator];
|
||||
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_negativeFormat];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_positiveFormat];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_attributesForPositiveValues];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_attributesForNegativeValues];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_maximum];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_minimum];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_roundingBehavior];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_roundingBehavior];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_attributedStringForNil];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_attributedStringForNotANumber];
|
||||
[encoder encodeValueOfObjCType: @encode(id)
|
||||
at: &_attributedStringForZero];
|
||||
[encoder encodeObject: _roundingBehavior];
|
||||
[encoder encodeObject: _maximum];
|
||||
[encoder encodeObject: _minimum];
|
||||
[encoder encodeObject: _attributedStringForNil];
|
||||
[encoder encodeObject: _attributedStringForNotANumber];
|
||||
[encoder encodeObject: _attributedStringForZero];
|
||||
[encoder encodeObject: _negativeFormat];
|
||||
[encoder encodeObject: _positiveFormat];
|
||||
[encoder encodeObject: _attributesForPositiveValues];
|
||||
[encoder encodeObject: _attributesForNegativeValues];
|
||||
}
|
||||
|
||||
- (NSString*) format
|
||||
{
|
||||
if (_attributedStringForZero != nil)
|
||||
|
@ -187,38 +174,16 @@
|
|||
[decoder decodeValueOfObjCType: @encode(unichar) at: &_thousandSeparator];
|
||||
[decoder decodeValueOfObjCType: @encode(unichar) at: &_decimalSeparator];
|
||||
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_negativeFormat];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_positiveFormat];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_attributesForPositiveValues];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_attributesForNegativeValues];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_maximum];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_negativeFormat];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_positiveFormat];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_attributesForPositiveValues];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_attributesForNegativeValues];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_maximum];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_minimum];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_roundingBehavior];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_roundingBehavior];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_attributedStringForNil];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_attributedStringForNotANumber];
|
||||
[decoder decodeValueOfObjCType: @encode(id)
|
||||
at: &_attributedStringForZero];
|
||||
_roundingBehavior = [decoder decodeObject];
|
||||
_maximum = [decoder decodeObject];
|
||||
_minimum = [decoder decodeObject];
|
||||
_attributedStringForNil = [decoder decodeObject];
|
||||
_attributedStringForNotANumber = [decoder decodeObject];
|
||||
_attributedStringForZero = [decoder decodeObject];
|
||||
_negativeFormat = [decoder decodeObject];
|
||||
_positiveFormat = [decoder decodeObject];
|
||||
_attributesForPositiveValues = [decoder decodeObject];
|
||||
_attributesForNegativeValues = [decoder decodeObject];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue