mirror of
https://github.com/gnustep/libs-steptalk.git
synced 2025-02-21 02:31:01 +00:00
Implement Smalltalk collection protocol methods for NSDictionary
This commit is contained in:
parent
b8def7f876
commit
f3ce2b7f32
4 changed files with 182 additions and 0 deletions
|
@ -1,3 +1,10 @@
|
|||
2019-02-22 Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||
|
||||
* GNUmakefile:
|
||||
* NSDictionary+additions.h:
|
||||
* NSDictionary+additions.m:
|
||||
Implement Smalltalk collection protocol methods for NSDictionary.
|
||||
|
||||
2017-12-27 Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||
|
||||
* STBlock.m (valueWithArguments:): Remove comma that unintentionally
|
||||
|
|
|
@ -29,6 +29,7 @@ BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Languages
|
|||
Smalltalk_OBJC_FILES = \
|
||||
SmalltalkEngine.m \
|
||||
NSArray+additions.m \
|
||||
NSDictionary+additions.m \
|
||||
NSNumber+additions.m \
|
||||
NSObject+additions.m \
|
||||
NSString+additions.m \
|
||||
|
|
37
Languages/Smalltalk/NSDictionary+additions.h
Normal file
37
Languages/Smalltalk/NSDictionary+additions.h
Normal file
|
@ -0,0 +1,37 @@
|
|||
/**
|
||||
NSDictionary-additions.m
|
||||
Various methods for NSDictionary
|
||||
|
||||
Copyright (c) 2019 Free Software Foundation
|
||||
|
||||
Written by: Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||
|
||||
This file is part of the StepTalk project.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*/
|
||||
|
||||
#import <Foundation/NSDictionary.h>
|
||||
|
||||
@class STBlock;
|
||||
|
||||
@interface NSDictionary (STCollecting)
|
||||
- do:(STBlock *)block;
|
||||
- select:(STBlock *)block;
|
||||
- reject:(STBlock *)block;
|
||||
- collect:(STBlock *)block;
|
||||
- detect:(STBlock *)block;
|
||||
@end
|
137
Languages/Smalltalk/NSDictionary+additions.m
Normal file
137
Languages/Smalltalk/NSDictionary+additions.m
Normal file
|
@ -0,0 +1,137 @@
|
|||
/**
|
||||
NSDictionary-additions.m
|
||||
Various methods for NSDictionary
|
||||
|
||||
Copyright (c) 2019 Free Software Foundation
|
||||
|
||||
Written by: Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||
|
||||
This file is part of the StepTalk project.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*/
|
||||
|
||||
#import "NSDictionary+additions.h"
|
||||
#import "NSNumber+additions.h"
|
||||
#import "STBlock.h"
|
||||
|
||||
#import <Foundation/NSAutoreleasePool.h>
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
|
||||
#import <StepTalk/STExterns.h>
|
||||
|
||||
@implementation NSDictionary (STCollecting)
|
||||
- do:(STBlock *)block
|
||||
{
|
||||
NSEnumerator *enumerator;
|
||||
id object;
|
||||
id retval = nil;
|
||||
|
||||
enumerator = [self objectEnumerator];
|
||||
while( (object = [enumerator nextObject]) )
|
||||
{
|
||||
retval = [block value:object];
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
- select:(STBlock *)block
|
||||
{
|
||||
NSMutableDictionary *dictionary;
|
||||
NSEnumerator *enumerator;
|
||||
id key;
|
||||
id object;
|
||||
id value;
|
||||
|
||||
dictionary = [NSMutableDictionary dictionary];
|
||||
|
||||
enumerator = [self keyEnumerator];
|
||||
while( (key = [enumerator nextObject]) )
|
||||
{
|
||||
object = [self objectForKey:key];
|
||||
value = [block value:object];
|
||||
if([(NSNumber *)value isTrue])
|
||||
{
|
||||
[dictionary setObject:object forKey:key];
|
||||
}
|
||||
}
|
||||
|
||||
return [NSDictionary dictionaryWithDictionary: dictionary];
|
||||
}
|
||||
|
||||
- reject:(STBlock *)block
|
||||
{
|
||||
NSMutableDictionary *dictionary;
|
||||
NSEnumerator *enumerator;
|
||||
id key;
|
||||
id object;
|
||||
id value;
|
||||
|
||||
dictionary = [NSMutableDictionary dictionary];
|
||||
|
||||
enumerator = [self keyEnumerator];
|
||||
while( (key = [enumerator nextObject]) )
|
||||
{
|
||||
object = [self objectForKey:key];
|
||||
value = [block value:object];
|
||||
if([(NSNumber *)value isFalse])
|
||||
{
|
||||
[dictionary setObject:object forKey:key];
|
||||
}
|
||||
}
|
||||
|
||||
return [NSDictionary dictionaryWithDictionary: dictionary];
|
||||
}
|
||||
|
||||
- collect:(STBlock *)block
|
||||
{
|
||||
NSMutableDictionary *dictionary;
|
||||
NSEnumerator *enumerator;
|
||||
id key;
|
||||
id value;
|
||||
|
||||
dictionary = [NSMutableDictionary dictionary];
|
||||
|
||||
enumerator = [self keyEnumerator];
|
||||
while( (key = [enumerator nextObject]) )
|
||||
{
|
||||
value = [block value:[self objectForKey:key]];
|
||||
if (value == nil)
|
||||
value = STNil;
|
||||
[dictionary setObject:value forKey:key];
|
||||
}
|
||||
|
||||
return [NSDictionary dictionaryWithDictionary: dictionary];
|
||||
|
||||
}
|
||||
- detect:(STBlock *)block
|
||||
{
|
||||
NSEnumerator *enumerator;
|
||||
id object;
|
||||
id retval = nil;
|
||||
|
||||
enumerator = [self objectEnumerator];
|
||||
while( (object = [enumerator nextObject]) )
|
||||
{
|
||||
retval = [block value:object];
|
||||
if([(NSNumber *)retval isTrue])
|
||||
{
|
||||
return object;
|
||||
}
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
@end
|
Loading…
Reference in a new issue