git.ithinksw.org
/
ITFoundation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding ITDebug.h to the framework header.
[ITFoundation.git]
/
ITStringScanner.m
diff --git
a/ITStringScanner.m
b/ITStringScanner.m
index
c3dff8e
..
0e71ff7
100755
(executable)
--- a/
ITStringScanner.m
+++ b/
ITStringScanner.m
@@
-2,56
+2,53
@@
#import "ITStringScanner.h"
#import "ITStringScanner.h"
-static NSString *AString(void)
-{
- return [NSString string];
-}
-
@implementation ITStringScanner
@implementation ITStringScanner
--(id)init
+
+- (id)init
{
{
- if (
self = [super init]
)
+ if (
( self = [super init] )
)
{
{
- strCStr = NULL;
- str = nil;
- curPos = size = 0;
+ _cString = NULL;
+ _string = nil;
+ _currentPosition = 0;
+ _size = 0;
}
return self;
}
}
return self;
}
--
(id)initWithString:(NSString*)str2
+-
(id)initWithString:(NSString*)string
{
{
- if (
self = [super init]
)
+ if (
( self = [super init] )
)
{
{
-
strCStr = (char *)[str2
cString];
-
str = [str2
retain];
-
curPos
= 0;
-
size = [str2
length];
+
_cString = (char *)[string
cString];
+
_string = [string
retain];
+
_currentPosition
= 0;
+
_size = [string
length];
}
return self;
}
}
return self;
}
--
(NSString *)scanUpToCharacter:(char)c
+-
(NSString *)scanUpToCharacter:(char)character
{
{
- size_t i=
curPos
,j=0;
+ size_t i=
_currentPosition
,j=0;
- if (
strCStr[i] == c
)
+ if (
_cString[i] == character
)
{
i++;
{
i++;
- return
AString()
;
+ return
@""
;
}
else
{
NSRange r = {i,0};
NSString *tmpStr = nil;
}
else
{
NSRange r = {i,0};
NSString *tmpStr = nil;
- const size_t tmp = size;
+ const size_t tmp =
_
size;
unsigned char foundIt = NO;
do
{
i++,j++;
unsigned char foundIt = NO;
do
{
i++,j++;
- if (
strCStr[i] == c
)
+ if (
_cString[i] == character
)
{
foundIt = YES;
r.length = j;
{
foundIt = YES;
r.length = j;
@@
-62,17
+59,17
@@
static NSString *AString(void)
if (foundIt)
{
if (foundIt)
{
- tmpStr = [
str
substringWithRange:r];
-
curPos
= i;
+ tmpStr = [
_string
substringWithRange:r];
+
_currentPosition
= i;
}
return tmpStr;
}
}
}
return tmpStr;
}
}
--
(NSString *)scanUpToString:(NSString*)str2
+-
(NSString *)scanUpToString:(NSString*)string
{
{
- size_t i=
curPos,j=0, len = [str2
length];
- const char *str2cstr = [str
2
cString];
+ size_t i=
_currentPosition,j=0, len = [string
length];
+ const char *str2cstr = [str
ing
cString];
if (len <= 1)
if (len <= 1)
@@
-80,13
+77,13
@@
static NSString *AString(void)
if (len)
return [self scanUpToCharacter:str2cstr[0]];
else
if (len)
return [self scanUpToCharacter:str2cstr[0]];
else
- return
AString()
;
+ return
@""
;
}
else
{
NSRange r = {i,0};
NSString *tmpStr = nil;
}
else
{
NSRange r = {i,0};
NSString *tmpStr = nil;
- const size_t tmp = size;
+ const size_t tmp =
_
size;
unsigned char foundIt = NO;
do
unsigned char foundIt = NO;
do
@@
-104,8
+101,8
@@
static NSString *AString(void)
if (foundIt)
{
if (foundIt)
{
- tmpStr = [
str
substringWithRange:r];
-
curPos
= i;
+ tmpStr = [
_string
substringWithRange:r];
+
_currentPosition
= i;
}
return tmpStr;
}
}
return tmpStr;
}