Revert subtly broken change

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21391 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2005-07-01 17:31:07 +00:00
parent 9ac16024f5
commit 6d0751af3e
56 changed files with 333 additions and 444 deletions

View file

@ -51,17 +51,26 @@
#define ULONG_LONG_MAX ULLONG_MAX
#endif
/**
* <p>
* The <code>NSScanner</code> class cluster (currently a single class in
* GNUstep) provides a mechanism to parse the contents of a string into
* number and string values by making a sequence of scan operations to
* step through the string retrieving successive items.
* </p>
* <p>
* You can tell the scanner whether its scanning is supposed to be
* case sensitive or not, and you can specify a set of characters
* to be skipped before each scanning operation (by default,
* whitespace and newlines).
* </p>
*/
@implementation NSScanner
@class GSCString;
@interface GSCString : NSObject // Help the compiler
@end
@class GSUnicodeString;
@interface GSUnicodeString : NSObject // Help the compiler
@end
@class GSMutableString;
@class GSPlaceholderString;
@interface GSPlaceholderString : NSObject // Help the compiler
@end
static Class NSStringClass;
static Class GSCStringClass;
@ -97,22 +106,6 @@ typedef struct {
(_scanLocation >= myLength()) ? NO : YES;\
})
/**
* <p>
* The <code>NSScanner</code> class cluster (currently a single class in
* GNUstep) provides a mechanism to parse the contents of a string into
* number and string values by making a sequence of scan operations to
* step through the string retrieving successive items.
* </p>
* <p>
* You can tell the scanner whether its scanning is supposed to be
* case sensitive or not, and you can specify a set of characters
* to be skipped before each scanning operation (by default,
* whitespace and newlines).
* </p>
*/
@implementation NSScanner
+ (void) initialize
{
if (self == [NSScanner class])
@ -202,9 +195,8 @@ typedef struct {
else
{
_isUnicode = NO;
_string = [_holder initWithCString:
(char*)((ivars)aString)->_contents.c
length: ((ivars)aString)->_count];
_string = [_holder initWithCString: ((ivars)aString)->_contents.c
length: ((ivars)aString)->_count];
}
}
else if (c == NSConstantStringClass)