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

* Source/NSXMLNode.m (-copyWithZone:): Don't set object value of

Browse source 
copy if it is nil.
* Source/NSXMLNode.m (+_objectForNode:): Use correct sub class
for decl nodes.
* Tests/base/NSXMLNode/basic.m: More tests.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34912 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2012-03-09 10:08:48 +00:00
parent a9288f57d0
commit 87c3b97c1c
3 changed files with 74 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2012-03-09 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLNode.m (-copyWithZone:): Don't set object value of
copy if it is nil.
* Source/NSXMLNode.m (+_objectForNode:): Use correct sub class for
decl nodes.
* Tests/base/NSXMLNode/basic.m: More tests.
2012-03-08 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLNode.m (-detach, -_insertChild:atIndex:): Maintain

80
Source/NSXMLNode.m
View file

@ -246,49 +246,50 @@ isEqualTree(xmlNodePtr nodeA, xmlNodePtr nodeB)
cls = [NSXMLElement class];
kind = NSXMLElementKind;
break;
case XML_TEXT_NODE:
cls = [NSXMLNode class];
kind = NSXMLTextKind;
case XML_DTD_NODE:
cls = [NSXMLDTD class];
kind = NSXMLDTDKind;
break;
case XML_PI_NODE:
cls = [NSXMLNode class];
kind = NSXMLProcessingInstructionKind;
case XML_ATTRIBUTE_DECL:
cls = [NSXMLDTDNode class];
kind = NSXMLAttributeDeclarationKind;
break;
case XML_COMMENT_NODE:
cls = [NSXMLNode class];
kind = NSXMLCommentKind;
case XML_ELEMENT_DECL:
cls = [NSXMLDTDNode class];
kind = NSXMLElementDeclarationKind;
break;
case XML_ENTITY_DECL:
cls = [NSXMLDTDNode class];
kind = NSXMLEntityDeclarationKind;
break;
case XML_NOTATION_NODE:
cls = [NSXMLDTDNode class];
kind = NSXMLNotationDeclarationKind;
break;
case XML_ATTRIBUTE_NODE:
cls = [NSXMLNode class];
kind = NSXMLAttributeKind;
break;
case XML_DTD_NODE:
cls = [NSXMLDTD class];
kind = NSXMLDTDKind;
break;
case XML_CDATA_SECTION_NODE:
cls = [NSXMLNode class];
kind = NSXMLTextKind;
// FIXME: Should set option
break;
case XML_COMMENT_NODE:
cls = [NSXMLNode class];
kind = NSXMLCommentKind;
break;
case XML_NAMESPACE_DECL:
cls = [NSXMLNode class];
kind = NSXMLNamespaceKind;
break;
case XML_ELEMENT_DECL:
case XML_PI_NODE:
cls = [NSXMLNode class];
kind = NSXMLElementDeclarationKind;
kind = NSXMLProcessingInstructionKind;
break;
case XML_ATTRIBUTE_DECL:
case XML_TEXT_NODE:
cls = [NSXMLNode class];
kind = NSXMLAttributeDeclarationKind;
break;
case XML_ENTITY_DECL:
cls = [NSXMLNode class];
kind = NSXMLEntityDeclarationKind;
break;
case XML_NOTATION_NODE:
cls = [NSXMLNode class];
kind = NSXMLNotationDeclarationKind;
kind = NSXMLTextKind;
break;
default:
NSLog(@"ERROR: _objectForNode: called with a node of type %d",
@ -889,7 +890,17 @@ execute_xpath(NSXMLNode *xmlNode, NSString *xpath_exp, NSString *nmspaces)
c = [c _initWithNode: newNode kind: internal->kind];
GSIVar(c, options) = internal->options;
[c setObjectValue: internal->objectValue];
if (nil != internal->objectValue)
{
/*
Only copy the objectValue when externally set.
The problem here are nodes created by parsing XML.
There the stringValue may be set, but the objectValue isn't.
This should rather be solved by creating a suitable objectValue,
when the node gets instantiated.
*/
[c setObjectValue: internal->objectValue];
}
[c setURI: [self URI]];
// [c setName: [self name]];
// [c setStringValue: [self stringValue]];
@ -1009,24 +1020,23 @@ execute_xpath(NSXMLNode *xmlNode, NSString *xpath_exp, NSString *nmspaces)
theSubclass = [NSXMLDTD class];
break;
case NSXMLEntityDeclarationKind:
case NSXMLElementDeclarationKind:
case NSXMLEntityDeclarationKind:
case NSXMLNotationDeclarationKind:
theSubclass = [NSXMLDTDNode class];
break;
case NSXMLAttributeKind:
case NSXMLCommentKind:
case NSXMLNamespaceKind:
case NSXMLProcessingInstructionKind:
case NSXMLTextKind:
break;
case NSXMLAttributeDeclarationKind:
[self release];
return nil;
break;
case NSXMLProcessingInstructionKind:
case NSXMLCommentKind:
case NSXMLTextKind:
case NSXMLNamespaceKind:
case NSXMLAttributeKind:
break;
default:
kind = NSXMLInvalidKind;
theSubclass = [NSXMLNode class];

29
Tests/base/NSXMLNode/basic.m
View file

@ -5,22 +5,35 @@
int main()
{
NSAutoreleasePool *arp = [NSAutoreleasePool new];
NSXMLNode *node;
NSXMLNode *other;
NSXMLNode *attr;
NSAutoreleasePool *arp = [NSAutoreleasePool new];
NSXMLNode *node;
NSXMLNode *other;
NSXMLNode *text;
NSXMLNode *pi;
NSXMLNode *comment;
NSXMLNode *ns;
NSXMLNode *attr;
NSNumber *number;
NSArray *instances;
test_alloc(@"NSXMLNode");
node = [[NSXMLNode alloc] initWithKind: NSXMLInvalidKind];
other = [[NSXMLNode alloc] initWithKind: NSXMLElementKind];
// We need to set the name, otherwise isEqual: wont work.
[other setName: @"test"];
text = [NSXMLNode textWithStringValue: @"Text node"];
pi = [NSXMLNode processingInstructionWithName: @"PI name"
stringValue: @"PI string"];
ns = [NSXMLNode processingInstructionWithName: @"name space name"
stringValue: @"name space string"];
comment = [NSXMLNode commentWithStringValue: @"Comment node"];
attr = [NSXMLNode attributeWithName: @"key"
stringValue: @"value"];
test_alloc(@"NSXMLNode");
test_NSObject(@"NSXMLNode", [NSArray arrayWithObjects: node, other, attr, nil]);
test_NSCopying(@"NSXMLNode", @"NSXMLNode", [NSArray arrayWithObjects: node, other, attr, nil], NO, YES);
instances = [NSArray arrayWithObjects: node, other, text, pi,
ns, comment, attr, nil];
test_NSObject(@"NSXMLNode", instances);
test_NSCopying(@"NSXMLNode", @"NSXMLNode", instances, NO, YES);
PASS(NO == [other isEqual: node], "different node kinds are not equal");
[other release];