gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSDateComponentsFormatter.m: Fix use of wrong operator.

Browse source
This commit is contained in:
fredkiefer 2020-08-30 22:27:08 +02:00
parent 3020662094
commit 93d4576871
2 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2020-08-30 Fred Kiefer <fredkiefer@gmx.de>
* Source/NSDateComponentsFormatter.m: Fix use of wrong operator.
2020-08-02 Gregory John Casamento <greg.casamento@gmail.com>
* Headers/Foundation/NSNotification.h: Add NSNotificatioName typedef

42
Source/NSDateComponentsFormatter.m
View file

@ -100,7 +100,7 @@
{
NSString *result = @"";
if (_allowedUnits | NSCalendarUnitYear)
if (_allowedUnits & NSCalendarUnitYear)
{
if (_unitsStyle == NSDateComponentsFormatterUnitsStyleSpellOut)
{
@ -115,7 +115,7 @@
else
{
if (_zeroFormattingBehavior
| NSDateComponentsFormatterZeroFormattingBehaviorDefault)
& NSDateComponentsFormatterZeroFormattingBehaviorDefault)
{
NSString *s;
@ -142,7 +142,7 @@
}
}
}
if (_allowedUnits | NSCalendarUnitMonth)
if (_allowedUnits & NSCalendarUnitMonth)
{
if (_unitsStyle == NSDateComponentsFormatterUnitsStyleSpellOut)
{
@ -157,7 +157,7 @@
else
{
if (_zeroFormattingBehavior
| NSDateComponentsFormatterZeroFormattingBehaviorDefault)
& NSDateComponentsFormatterZeroFormattingBehaviorDefault)
{
NSString *s;
@ -184,7 +184,7 @@
}
}
}
if (_allowedUnits | NSCalendarUnitDay)
if (_allowedUnits & NSCalendarUnitDay)
{
if (_unitsStyle == NSDateComponentsFormatterUnitsStyleSpellOut)
{
@ -199,7 +199,7 @@
else
{
if (_zeroFormattingBehavior
| NSDateComponentsFormatterZeroFormattingBehaviorDefault)
& NSDateComponentsFormatterZeroFormattingBehaviorDefault)
{
NSString *s;
@ -226,7 +226,7 @@
}
}
}
if (_allowedUnits | NSCalendarUnitHour)
if (_allowedUnits & NSCalendarUnitHour)
{
if (_unitsStyle == NSDateComponentsFormatterUnitsStyleSpellOut)
{
@ -241,7 +241,7 @@
else
{
if (_zeroFormattingBehavior
| NSDateComponentsFormatterZeroFormattingBehaviorDefault)
& NSDateComponentsFormatterZeroFormattingBehaviorDefault)
{
NSString *s;
@ -268,7 +268,7 @@
}
}
}
if (_allowedUnits | NSCalendarUnitMinute)
if (_allowedUnits & NSCalendarUnitMinute)
{
if (_unitsStyle == NSDateComponentsFormatterUnitsStyleSpellOut)
{
@ -283,7 +283,7 @@
else
{
if (_zeroFormattingBehavior
| NSDateComponentsFormatterZeroFormattingBehaviorDefault)
& NSDateComponentsFormatterZeroFormattingBehaviorDefault)
{
NSString *s;
@ -310,7 +310,7 @@
}
}
}
if (_allowedUnits | NSCalendarUnitSecond)
if (_allowedUnits & NSCalendarUnitSecond)
{
if (_unitsStyle == NSDateComponentsFormatterUnitsStyleSpellOut)
{
@ -325,7 +325,7 @@
else
{
if (_zeroFormattingBehavior
| NSDateComponentsFormatterZeroFormattingBehaviorDefault)
& NSDateComponentsFormatterZeroFormattingBehaviorDefault)
{
NSString *s;
@ -352,7 +352,7 @@
}
}
}
if (_allowedUnits | NSCalendarUnitWeekOfMonth)
if (_allowedUnits & NSCalendarUnitWeekOfMonth)
{
if (_unitsStyle == NSDateComponentsFormatterUnitsStyleSpellOut)
{
@ -369,7 +369,7 @@
else
{
if (_zeroFormattingBehavior
| NSDateComponentsFormatterZeroFormattingBehaviorDefault)
& NSDateComponentsFormatterZeroFormattingBehaviorDefault)
{
long wom = (long)[components weekOfMonth];
NSString *s = [NSString stringWithFormat: @"%2ld", wom];
@ -437,13 +437,13 @@
- (void) setAllowedUnits: (NSCalendarUnit)units
{
if (units | NSCalendarUnitYear
&& units | NSCalendarUnitMonth
&& units | NSCalendarUnitDay
&& units | NSCalendarUnitHour
&& units | NSCalendarUnitMinute
&& units | NSCalendarUnitSecond
&& units | NSCalendarUnitWeekOfMonth)
if (units & NSCalendarUnitYear
&& units & NSCalendarUnitMonth
&& units & NSCalendarUnitDay
&& units & NSCalendarUnitHour
&& units & NSCalendarUnitMinute
&& units & NSCalendarUnitSecond
&& units & NSCalendarUnitWeekOfMonth)
{
[NSException raise: NSInvalidArgumentException
format: @"Passed invalid unit into allowedUnits"];