gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve documentation generation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12399 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-02-03 17:21:20 +00:00
parent 0d428a62d8
commit fc4d23e09f
10 changed files with 187 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Source/NSDictionary.m
View file

@ -354,12 +354,18 @@ static SEL appSel;
return [self initWithObjects: NULL forKeys: NULL count: 0];
}
- (id) initWithDictionary: (NSDictionary*)other
- (id) initWithDictionary: (NSDictionary*)otherDictionary
{
return [self initWithDictionary: other copyItems: NO];
return [self initWithDictionary: otherDictionary copyItems: NO];
}
- (id) initWithDictionary: (NSDictionary*)other copyItems: (BOOL)shouldCopy
/**
* Initialise dictionary with the keys and values of otherDictionary.
* If the shouldCopy flag is YES then the values are copied into the
* newly initialised dictionary, otherwise they are simply retained.
*/
- (id) initWithDictionary: (NSDictionary*)other
copyItems: (BOOL)shouldCopy
{
unsigned c = [other count];
@ -1062,19 +1068,24 @@ static NSString *indentStrings[] = {
}
}
- (void) addEntriesFromDictionary: (NSDictionary*)other
/**
* Merges information from otherDictionary into the receiver.
* If a key exists in both dictionaries, the value from otherDictionary
* replaces that which was originally in the reciever.
*/
- (void) addEntriesFromDictionary: (NSDictionary*)otherDictionary
{
if (other != nil && other != self)
if (otherDictionary != nil && otherDictionary != self)
{
id k;
NSEnumerator *e = [other keyEnumerator];
NSEnumerator *e = [otherDictionary keyEnumerator];
IMP nxtObj = [e methodForSelector: nxtSel];
IMP getObj = [other methodForSelector: objSel];
IMP getObj = [otherDictionary methodForSelector: objSel];
IMP setObj = [self methodForSelector: setSel];
while ((k = (*nxtObj)(e, nxtSel)) != nil)
{
(*setObj)(self, setSel, (*getObj)(other, objSel, k), k);
(*setObj)(self, setSel, (*getObj)(otherDictionary, objSel, k), k);
}
}
}