* Headers/Foundation/NSXMLNode.h: Add _stringValue

* Source/NSXMLNode.m: Change stringValue and setStringValue:
	resolvingEntities: to assign to _stringValue instead of _objectValue.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34404 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2012-01-03 17:23:44 +00:00
parent 7dc6ad72bd
commit 15fee4d787
3 changed files with 10 additions and 5 deletions

View file

@ -1,3 +1,9 @@
2012-01-03 12:17-EST Gregory John Casamento <greg.casamento@gmail.com>
* Headers/Foundation/NSXMLNode.h: Add _stringValue
* Source/NSXMLNode.m: Change stringValue and setStringValue:
resolvingEntities: to assign to _stringValue instead of _objectValue.
2012-01-03 12:06-EST Gregory John Casamento <greg.casamento@gmail.com> 2012-01-03 12:06-EST Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSXMLDocument.m: Change stack implementation to * Source/NSXMLDocument.m: Change stack implementation to

View file

@ -87,6 +87,7 @@ typedef NSUInteger NSXMLNodeKind;
NSXMLNode *_parent; NSXMLNode *_parent;
NSUInteger _index; NSUInteger _index;
id _objectValue; id _objectValue;
NSString *_stringValue;
NSString *_name; NSString *_name;
#endif #endif
#if GS_NONFRAGILE #if GS_NONFRAGILE

View file

@ -469,11 +469,9 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
return (NSXMLDocument*)ancestor; return (NSXMLDocument*)ancestor;
} }
- (NSString*) stringValue - (NSString*) stringValue
{ {
// FIXME return _stringValue;
return _objectValue;
} }
- (NSString*) URI - (NSString*) URI
@ -530,11 +528,11 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
{ {
if(resolve == NO) if(resolve == NO)
{ {
ASSIGN(_objectValue, string); ASSIGN(_stringValue, string);
} }
else else
{ {
ASSIGN(_objectValue, string); // need to actually resolve entities... ASSIGN(_stringValue, string); // need to actually resolve entities...
} }
} }