gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify compare

Browse source
This commit is contained in:
Gregory John Casamento 2019-10-24 14:58:43 -04:00
parent 2e943461f8
commit 7accf04103
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Headers/Foundation/NSDateInterval.h
View file

@ -1,4 +1,3 @@
/* Definition of class NSDateInterval
Copyright (C) 2019 Free Software Foundation, Inc.

41
Source/NSDateInterval.m
View file

@ -134,27 +134,32 @@
// Compare
- (NSComparisonResult) compare: (NSDateInterval *)dateInterval
{
// NSOrderedAscending
NSComparisonResult result = NSOrderedSame;
if([_startDate isEqualToDate: [dateInterval startDate]] &&
_duration < [dateInterval duration])
return NSOrderedAscending;
{
result = NSOrderedAscending;
}
else if([_startDate compare: [dateInterval startDate]] == NSOrderedAscending)
{
result = NSOrderedAscending;
}
else if([self isEqualToDateInterval: dateInterval])
{
result = NSOrderedSame;
}
else if([_startDate isEqualToDate: [dateInterval startDate]] &&
_duration > [dateInterval duration])
{
result = NSOrderedDescending;
}
else if([_startDate compare: [dateInterval startDate]] == NSOrderedDescending)
{
result = NSOrderedDescending;
}
if([_startDate compare: [dateInterval startDate]] == NSOrderedAscending)
return NSOrderedAscending;
// NSOrderedSame
if([self isEqualToDateInterval: dateInterval])
return NSOrderedSame;
// NSOrderedDescending
if([_startDate isEqualToDate: [dateInterval startDate]] &&
_duration > [dateInterval duration])
return NSOrderedDescending;
if([_startDate compare: [dateInterval startDate]] == NSOrderedDescending)
return NSOrderedDescending;
return 0;
return result;
}
- (BOOL) isEqualToDateInterval: (NSDateInterval *)dateInterval