--- a/String.st Wed Apr 03 00:06:56 1996 +0200
+++ b/String.st Wed Apr 03 00:09:24 1996 +0200
@@ -89,7 +89,7 @@
int nInstVars, instsize;
if (__isSmallInteger(anInteger)) {
- len = _intVal(anInteger);
+ len = __intVal(anInteger);
if (len >= 0) {
if (self == String) {
instsize = OHDR_SIZE + len + 1;
@@ -98,10 +98,10 @@
* the most common case
*/
__qCheckedNew(newString, instsize);
- _InstPtr(newString)->o_class = self;
+ __InstPtr(newString)->o_class = self;
__qSTORE(newString, self);
- cp = _stringVal(newString);
+ cp = __stringVal(newString);
#if defined(memset4) && !defined(NON_ASCII)
instsize = len >> 2;
if (len & 3) instsize++;
@@ -132,7 +132,7 @@
}
nInstVars = 0;
} else {
- nInstVars = _intVal(_ClassInstPtr(self)->c_ninstvars);
+ nInstVars = __intVal(__ClassInstPtr(self)->c_ninstvars);
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars) + len + 1;
}
@@ -140,28 +140,28 @@
__qNew(newString, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newString == nil) goto fail;
- _InstPtr(newString)->o_class = self;
+ __InstPtr(newString)->o_class = self;
__qSTORE(newString, self);
if (nInstVars) {
#if defined(memset4)
- memset4(_InstPtr(newString)->i_instvars, nil, nInstVars);
+ memset4(__InstPtr(newString)->i_instvars, nil, nInstVars);
#else
# if defined(FAST_MEMSET) && ! defined(NEGATIVE_ADDRESSES)
/*
* knowing that nil is 0
*/
- memset(_InstPtr(newString)->i_instvars, 0, __OBJS2BYTES__(nInstVars));
+ memset(__InstPtr(newString)->i_instvars, 0, __OBJS2BYTES__(nInstVars));
# else
- op = _InstPtr(newString)->i_instvars;
+ op = __InstPtr(newString)->i_instvars;
do {
*op++ = nil;
} while (--nInstVars);
# endif
#endif
- cp = _stringVal(newString) + __OBJS2BYTES__(nInstVars);
+ cp = __stringVal(newString) + __OBJS2BYTES__(nInstVars);
} else {
- cp = _stringVal(newString);
+ cp = __stringVal(newString);
}
#ifdef FAST_MEMSET
@@ -282,13 +282,13 @@
REGISTER OBJ cls;
if (__isSmallInteger(index)) {
- indx = _intVal(index);
+ indx = __intVal(index);
if (indx > 0) {
cls = __qClass(self);
if (cls != String)
- indx += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
- if (indx <= (_stringSize(self))) {
- RETURN ( _MKCHARACTER(_stringVal(self)[indx-1] & 0xFF) );
+ indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+ if (indx <= (__stringSize(self))) {
+ RETURN ( __MKCHARACTER(__stringVal(self)[indx-1] & 0xFF) );
}
}
}
@@ -308,7 +308,7 @@
if (__isString(self)) {
if (__isCharacter(aCharacter)) {
- value = _intVal(_characterVal(aCharacter));
+ value = __intVal(_characterVal(aCharacter));
#ifdef OLD
if ((value > 0)
&& (value <= 255)
@@ -316,10 +316,10 @@
if (((value & ~0xFF) == 0)
#endif
&& __isSmallInteger(index)) {
- indx = _intVal(index);
+ indx = __intVal(index);
if (indx > 0) {
- if (indx <= (_stringSize(self))) {
- _stringVal(self)[indx-1] = value;
+ if (indx <= (__stringSize(self))) {
+ __stringVal(self)[indx-1] = value;
RETURN ( aCharacter );
}
}
@@ -359,13 +359,13 @@
REGISTER OBJ cls;
if (__isSmallInteger(index)) {
- indx = _intVal(index);
+ indx = __intVal(index);
if (indx > 0) {
cls = __qClass(self);
if (cls != String)
- indx += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
- if (indx <= (_stringSize(self))) {
- RETURN ( _MKCHARACTER(_stringVal(self)[indx-1] & 0xFF) );
+ indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+ if (indx <= (__stringSize(self))) {
+ RETURN ( __MKCHARACTER(__stringVal(self)[indx-1] & 0xFF) );
}
}
}
@@ -384,14 +384,14 @@
if (__isString(self)) {
if (__isCharacter(aCharacter)) {
- value = _intVal(_characterVal(aCharacter));
+ value = __intVal(_characterVal(aCharacter));
if ((value > 0)
&& (value <= 255)
&& __isSmallInteger(index)) {
- indx = _intVal(index);
+ indx = __intVal(index);
if (indx > 0) {
- if (indx <= (_stringSize(self))) {
- _stringVal(self)[indx-1] = value;
+ if (indx <= (__stringSize(self))) {
+ __stringVal(self)[indx-1] = value;
RETURN ( aCharacter );
}
}
@@ -430,10 +430,10 @@
cls = __qClass(self);
if (cls == String) {
- RETURN ( _MKSMALLINT(_stringSize(self)) );
+ RETURN ( __MKSMALLINT(__stringSize(self)) );
}
- RETURN ( _MKSMALLINT(_stringSize(self)
- - __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars))));
+ RETURN ( __MKSMALLINT(__stringSize(self)
+ - __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars))));
%}
!
@@ -448,10 +448,10 @@
cls = __qClass(self);
if (cls == String) {
- RETURN ( _MKSMALLINT(_stringSize(self)) );
+ RETURN ( __MKSMALLINT(__stringSize(self)) );
}
- RETURN ( _MKSMALLINT(_stringSize(self)
- - __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars))));
+ RETURN ( __MKSMALLINT(__stringSize(self)
+ - __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars))));
%}
! !
@@ -489,12 +489,12 @@
OBJ cls;
if (__isCharacter(aCharacter)) {
- byteValue = _intVal(_characterVal(aCharacter));
- cp = _stringVal(self);
+ byteValue = __intVal(_characterVal(aCharacter));
+ cp = __stringVal(self);
if ((cls = __qClass(self)) != String)
- cp += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ cp += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
#ifdef FAST_STRCHR
- cp = (unsigned char *) strchr(cp, _intVal(_characterVal(aCharacter)));
+ cp = (unsigned char *) strchr(cp, __intVal(_characterVal(aCharacter)));
if (cp) {
RETURN ( true );
}
@@ -531,10 +531,10 @@
OBJ cls;
if (__isString(aCollection)) {
- matchP = _stringVal(aCollection);
- cp = _stringVal(self);
+ matchP = __stringVal(aCollection);
+ cp = __stringVal(self);
if ((cls = __qClass(self)) != String)
- cp += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ cp += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
while (*cp) {
if (strchr(matchP, *cp)) {
@@ -574,19 +574,19 @@
OBJ cls;
if (__isCharacter(aCharacter)) {
- cp = _stringVal(self);
+ cp = __stringVal(self);
if ((cls = __qClass(self)) != String)
- cp += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ cp += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
#ifdef FAST_STRCHR
- cp = (unsigned char *) strchr(cp, _intVal(_characterVal(aCharacter)));
+ cp = (unsigned char *) strchr(cp, __intVal(_characterVal(aCharacter)));
if (cp) {
- RETURN ( _MKSMALLINT(cp - _stringVal(self) + 1) );
+ RETURN ( __MKSMALLINT(cp - __stringVal(self) + 1) );
}
#else
- byteValue = _intVal(_characterVal(aCharacter));
+ byteValue = __intVal(_characterVal(aCharacter));
index = 1;
while (c = *cp++) {
- if (c == byteValue) { RETURN ( _MKSMALLINT(index) ); }
+ if (c == byteValue) { RETURN ( __MKSMALLINT(index) ); }
index++;
}
#endif
@@ -620,31 +620,31 @@
if (__isSmallInteger(start)) {
if (__isCharacter(aCharacter)) {
- byteValue = _intVal(_characterVal(aCharacter));
- index = _intVal(start);
+ byteValue = __intVal(_characterVal(aCharacter));
+ index = __intVal(start);
if (index <= 0)
index = 1;
if ((cls = __qClass(self)) != String)
- index += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
- len = _stringSize(self);
+ index += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+ len = __stringSize(self);
if (index <= len) {
- cp = _stringVal(self) + index - 1;
+ cp = __stringVal(self) + index - 1;
#ifdef FAST_STRCHR
cp = (unsigned char *) strchr(cp, byteValue);
if (cp) {
- RETURN ( _MKSMALLINT(cp - _stringVal(self) + 1) );
+ RETURN ( __MKSMALLINT(cp - __stringVal(self) + 1) );
}
#else
while (c = *cp++) {
if (c == byteValue) {
- RETURN ( _MKSMALLINT(index) );
+ RETURN ( __MKSMALLINT(index) );
}
index++;
}
#endif
}
}
- RETURN ( _MKSMALLINT(0) );
+ RETURN ( __MKSMALLINT(0) );
}
%}.
^ super indexOf:aCharacter startingAt:start
@@ -673,24 +673,24 @@
if (__isSmallInteger(start)
&& __isString(aCollectionOfCharacters)) {
matchP = __stringVal(aCollectionOfCharacters);
- index = _intVal(start);
+ index = __intVal(start);
if (index <= 0)
index = 1;
if ((cls = __qClass(self)) != String)
- index += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
- len = _stringSize(self);
+ index += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+ len = __stringSize(self);
if (index <= len) {
- cp = _stringVal(self) + index - 1;
+ cp = __stringVal(self) + index - 1;
while (c = *cp++) {
for (ccp = matchP; *ccp ; ccp++) {
if (*ccp == c) {
- RETURN ( _MKSMALLINT(index) );
+ RETURN ( __MKSMALLINT(index) );
}
}
index++;
}
}
- RETURN ( _MKSMALLINT(0) );
+ RETURN ( __MKSMALLINT(0) );
}
%}.
"/
@@ -715,24 +715,24 @@
int len, index;
OBJ cls;
- index = _intVal(start);
+ index = __intVal(start);
if (index <= 0) {
index = 1;
}
if ((cls = __qClass(self)) != String)
- index += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
- len = _stringSize(self);
+ index += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+ len = __stringSize(self);
if (index > len) {
- RETURN ( _MKSMALLINT(0) );
+ RETURN ( __MKSMALLINT(0) );
}
- cp = _stringVal(self) + index - 1;
+ cp = __stringVal(self) + index - 1;
while (c = *cp++) {
#ifndef NON_ASCII /* i.e. EBCDIC ;-) */
if (c <= ' ')
#endif
if ((c == ' ') || (c == '\t') || (c == '\n')
|| (c == '\r') || (c == '\f')) {
- RETURN ( _MKSMALLINT(cp - _stringVal(self)) );
+ RETURN ( __MKSMALLINT(cp - __stringVal(self)) );
}
}
%}
@@ -758,14 +758,14 @@
if (__isCharacter(aCharacter)) {
count = 0;
- byteValue = _intVal(_characterVal(aCharacter));
- cp = _stringVal(self);
+ byteValue = __intVal(_characterVal(aCharacter));
+ cp = __stringVal(self);
if ((cls = __qClass(self)) != String)
- cp += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ cp += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
while (*cp) {
if (*cp++ == byteValue) count++;
}
- RETURN ( _MKSMALLINT(count) );
+ RETURN ( __MKSMALLINT(count) );
}
%}.
^ 0
@@ -802,25 +802,25 @@
}
if (((cls = __qClass(s)) == String) || (cls == Symbol) || (cls == __qClass(self))) {
- cp1 = (char *) _stringVal(self);
- l1 = _stringSize(self);
+ cp1 = (char *) __stringVal(self);
+ l1 = __stringSize(self);
/*
* care for instances of subclasses ...
*/
if (__qClass(self) != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(self))->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(self))->c_ninstvars));
cp1 += n;
l1 -= n;
}
- cp2 = (char *) _stringVal(s);
- l2 = _stringSize(s);
+ cp2 = (char *) __stringVal(s);
+ l2 = __stringSize(s);
/*
* care for instances of subclasses ...
*/
if (cls != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
cp2 += n;
l2 -= n;
@@ -858,26 +858,26 @@
if (__isNonNilObject(s)
&& (((cls = __qClass(s)) == String) || (cls == Symbol) || (cls == __qClass(self)))) {
- cp1 = (char *) _stringVal(self);
- len1 = _stringSize(self);
+ cp1 = (char *) __stringVal(self);
+ len1 = __stringSize(self);
/*
* care for instances of subclasses ...
*/
if (__qClass(self) != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(self))->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(self))->c_ninstvars));
cp1 += n;
len1 -= n;
}
- cp2 = (char *) _stringVal(s);
- len2 = _stringSize(s);
+ cp2 = (char *) __stringVal(s);
+ len2 = __stringSize(s);
/*
* care for instances of subclasses ...
*/
if (cls != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
cp2 += n;
len2 -= n;
@@ -916,23 +916,23 @@
if (__isNonNilObject(s)
&& (((cls = __qClass(s)) == String) || (cls == Symbol) || (cls == __qClass(self)))) {
- cp1 = (char *) _stringVal(self);
+ cp1 = (char *) __stringVal(self);
/*
* care for instances of subclasses ...
*/
if (__qClass(self) != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(self))->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(self))->c_ninstvars));
cp1 += n;
}
- cp2 = (char *) _stringVal(s);
+ cp2 = (char *) __stringVal(s);
/*
* care for instances of subclasses ...
*/
if (cls != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
cp2 += n;
}
@@ -975,25 +975,25 @@
RETURN ( true );
}
if (((cls = __qClass(s)) == String) || (cls == Symbol) || (cls == __qClass(self))) {
- cp1 = (char *) _stringVal(self);
- l1 = _stringSize(self);
+ cp1 = (char *) __stringVal(self);
+ l1 = __stringSize(self);
/*
* care for instances of subclasses ...
*/
if (__qClass(self) != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(self))->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(self))->c_ninstvars));
cp1 += n;
l1 -= n;
}
- cp2 = (char *) _stringVal(s);
- l2 = _stringSize(s);
+ cp2 = (char *) __stringVal(s);
+ l2 = __stringSize(s);
/*
* care for instances of subclasses ...
*/
if (cls != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
cp2 += n;
l2 -= n;
@@ -1019,7 +1019,7 @@
OBJ newSymbol;
if (__qClass(self) == String) {
- newSymbol = _MKSYMBOL(_stringVal(self), (OBJ *)0, __context);
+ newSymbol = __MKSYMBOL(__stringVal(self), (OBJ *)0, __context);
if (newSymbol) {
RETURN ( newSymbol);
}
@@ -1048,7 +1048,7 @@
OBJ __SYMBOL_OR_NIL();
if (__qClass(self) == String) {
- RETURN ( __SYMBOL_OR_NIL(_stringVal(self)));
+ RETURN ( __SYMBOL_OR_NIL(__stringVal(self)));
}
%}.
self primitiveFailed
@@ -1138,7 +1138,7 @@
sz = OHDR_SIZE + sz + 1;
__qNew(newString, sz, __context);
if (newString != nil) {
- _InstPtr(newString)->o_class = String;
+ __InstPtr(newString)->o_class = String;
/*
* expand
@@ -1192,19 +1192,19 @@
if ((myClass == argClass)
|| (((myClass == _string) || (myClass == Symbol))
&& ((argClass == _string) || (argClass == Symbol)))) {
- cp1 = (char *) _stringVal(self);
- l1 = _stringSize(self);
+ cp1 = (char *) __stringVal(self);
+ l1 = __stringSize(self);
if (myClass != _string) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(self))->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(self))->c_ninstvars));
cp1 += n;
l1 -= n;
}
- cp2 = (char *) _stringVal(s);
- l2 = _stringSize(s);
+ cp2 = (char *) __stringVal(s);
+ l2 = __stringSize(s);
if (argClass != _string) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(s))->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(s))->c_ninstvars));
cp2 += n;
l2 -= n;
@@ -1213,13 +1213,13 @@
sz = OHDR_SIZE + l1 + l2 + 1;
__qNew(newString, sz, __context);
if (newString != nil) {
- _InstPtr(newString)->o_class = String;
- dstp = _stringVal(newString);
+ __InstPtr(newString)->o_class = String;
+ dstp = __stringVal(newString);
/*
* refetch in case of a GC
*/
- cp1 = (char *) _stringVal(self);
- cp2 = (char *) _stringVal(aString);
+ cp1 = (char *) __stringVal(self);
+ cp2 = (char *) __stringVal(aString);
#ifdef FAST_MEMCPY
bcopy(cp1, dstp, l1);
bcopy(cp2, dstp + l1, l2+1);
@@ -1257,31 +1257,31 @@
if ((__isString(self) || __isSymbol(self))
&& (__isString(string1) || __isSymbol(string1))
&& (__isString(string2) || __isSymbol(string2))) {
- len1 = _stringSize(self);
- len2 = _stringSize(string1);
- len3 = _stringSize(string2);
+ len1 = __stringSize(self);
+ len2 = __stringSize(string1);
+ len3 = __stringSize(string2);
sz = OHDR_SIZE + len1 + len2 + len3 + 1;
__qNew(newString, sz, __context);
if (newString != nil) {
- _InstPtr(newString)->o_class = String;
- dstp = _stringVal(newString);
+ __InstPtr(newString)->o_class = String;
+ dstp = __stringVal(newString);
#ifdef FAST_MEMCPY
- bcopy(_stringVal(self), dstp, len1);
- bcopy(_stringVal(string1), dstp + len1, len2);
- bcopy(_stringVal(string2), dstp + len1 + len2, len3+1);
+ bcopy(__stringVal(self), dstp, len1);
+ bcopy(__stringVal(string1), dstp + len1, len2);
+ bcopy(__stringVal(string2), dstp + len1 + len2, len3+1);
#else
# ifdef FAST_STRCPY
- strcpy(dstp, _stringVal(self));
- strcpy(dstp + len1, _stringVal(string1));
- strcpy(dstp + len1 + len2, _stringVal(string2));
+ strcpy(dstp, __stringVal(self));
+ strcpy(dstp + len1, __stringVal(string1));
+ strcpy(dstp + len1 + len2, __stringVal(string2));
# else
- srcp = _stringVal(self);
+ srcp = __stringVal(self);
while ((*dstp++ = *srcp++) != '\0') ;
dstp--;
- srcp = _stringVal(string1);
+ srcp = __stringVal(string1);
while ((*dstp++ = *srcp++) != '\0') ;
dstp--;
- srcp = _stringVal(string2);
+ srcp = __stringVal(string2);
while ((*dstp++ = *srcp++) != '\0') ;
# endif
#endif
@@ -1309,37 +1309,37 @@
&& (__isString(string1) || __isSymbol(string1))
&& (__isString(string2) || __isSymbol(string2))
&& (__isString(string3) || __isSymbol(string3))) {
- len1 = _stringSize(self);
- len2 = _stringSize(string1);
- len3 = _stringSize(string2);
- len4 = _stringSize(string3);
+ len1 = __stringSize(self);
+ len2 = __stringSize(string1);
+ len3 = __stringSize(string2);
+ len4 = __stringSize(string3);
sz = OHDR_SIZE + len1 + len2 + len3 + len4 + 1;
__qNew(newString, sz, __context);
if (newString != nil) {
- _InstPtr(newString)->o_class = String;
- dstp = _stringVal(newString);
+ __InstPtr(newString)->o_class = String;
+ dstp = __stringVal(newString);
#ifdef FAST_MEMCPY
- bcopy(_stringVal(self), dstp, len1);
- bcopy(_stringVal(string1), dstp + len1, len2);
- bcopy(_stringVal(string2), dstp + len1 + len2, len3);
- bcopy(_stringVal(string3), dstp + len1 + len2 + len3, len4+1);
+ bcopy(__stringVal(self), dstp, len1);
+ bcopy(__stringVal(string1), dstp + len1, len2);
+ bcopy(__stringVal(string2), dstp + len1 + len2, len3);
+ bcopy(__stringVal(string3), dstp + len1 + len2 + len3, len4+1);
#else
# ifdef FAST_STRCPY
- strcpy(dstp, _stringVal(self));
- strcpy(dstp + len1, _stringVal(string1));
- strcpy(dstp + len1 + len2, _stringVal(string2));
- strcpy(dstp + len1 + len2 + len3, _stringVal(string3));
+ strcpy(dstp, __stringVal(self));
+ strcpy(dstp + len1, __stringVal(string1));
+ strcpy(dstp + len1 + len2, __stringVal(string2));
+ strcpy(dstp + len1 + len2 + len3, __stringVal(string3));
# else
- srcp = _stringVal(self);
+ srcp = __stringVal(self);
while ((*dstp++ = *srcp++) != '\0') ;
dstp--;
- srcp = _stringVal(string1);
+ srcp = __stringVal(string1);
while ((*dstp++ = *srcp++) != '\0') ;
dstp--;
- srcp = _stringVal(string2);
+ srcp = __stringVal(string2);
while ((*dstp++ = *srcp++) != '\0') ;
dstp--;
- srcp = _stringVal(string3);
+ srcp = __stringVal(string3);
while ((*dstp++ = *srcp++) != '\0') ;
# endif
#endif
@@ -1367,11 +1367,11 @@
OBJ newString;
if (__isSmallInteger(start)) {
- len = _stringSize(self);
- index1 = _intVal(start);
+ len = __stringSize(self);
+ index1 = __intVal(start);
if (index1 > 0) {
if (__qClass(self) != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(self))->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(self))->c_ninstvars));
index1 += n;
}
@@ -1382,17 +1382,17 @@
__qNew(newString, sz, SENDER);
__UNPROTECT_CONTEXT__
if (newString != nil) {
- _InstPtr(newString)->o_class = String;
- dstp = _stringVal(newString);
+ __InstPtr(newString)->o_class = String;
+ dstp = __stringVal(newString);
#ifdef FAST_MEMCPY
- bcopy(_stringVal(self) + index1 - 1, dstp, count);
+ bcopy(__stringVal(self) + index1 - 1, dstp, count);
dstp[count] = '\0';
#else
# ifdef FAST_STRCPY
- strncpy(dstp, _stringVal(self) + index1 - 1, count);
+ strncpy(dstp, __stringVal(self) + index1 - 1, count);
dstp[count] = '\0';
# else
- srcp = _stringVal(self) + index1 - 1;
+ srcp = __stringVal(self) + index1 - 1;
while (count--) {
*dstp++ = *srcp++;
}
@@ -1428,13 +1428,13 @@
OBJ newString;
if (__bothSmallInteger(start, stop)) {
- len = _stringSize(self);
- index1 = _intVal(start);
- index2 = _intVal(stop);
+ len = __stringSize(self);
+ index1 = __intVal(start);
+ index2 = __intVal(stop);
if ((index1 <= index2) && (index1 > 0)) {
if (__qClass(self) != String) {
- int n = __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(self))->c_ninstvars));
+ int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(self))->c_ninstvars));
index1 += n;
index2 += n;
@@ -1446,17 +1446,17 @@
__qNew(newString, sz, SENDER);
__UNPROTECT_CONTEXT__
if (newString != nil) {
- _InstPtr(newString)->o_class = String;
- dstp = _stringVal(newString);
+ __InstPtr(newString)->o_class = String;
+ dstp = __stringVal(newString);
#ifdef FAST_MEMCPY
- bcopy(_stringVal(self) + index1 - 1, dstp, count);
+ bcopy(__stringVal(self) + index1 - 1, dstp, count);
dstp[count] = '\0';
#else
# ifdef FAST_STRCPY
- strncpy(dstp, _stringVal(self) + index1 - 1, count);
+ strncpy(dstp, __stringVal(self) + index1 - 1, count);
dstp[count] = '\0';
# else
- srcp = _stringVal(self) + index1 - 1;
+ srcp = __stringVal(self) + index1 - 1;
while (count--) {
*dstp++ = *srcp++;
}
@@ -1475,7 +1475,7 @@
__qNew(newString, OHDR_SIZE+1, SENDER);
__UNPROTECT_CONTEXT__
if (newString != nil) {
- _InstPtr(newString)->o_class = String;
+ __InstPtr(newString)->o_class = String;
__stringVal(newString)[0] = '\0';
RETURN ( newString );
}
@@ -1505,7 +1505,7 @@
if (__isCharacter(aCharacter)) {
sz = __qSize(self) + 1;
if ((cls = __qClass(self)) != String) {
- offs = __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ offs = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
sz -= offs;
} else
offs = 0;
@@ -1514,27 +1514,27 @@
__qNew(newString, sz, SENDER);
__UNPROTECT_CONTEXT__
if (newString) {
- _InstPtr(newString)->o_class = String;
- dstp = _stringVal(newString);
+ __InstPtr(newString)->o_class = String;
+ dstp = __stringVal(newString);
#ifdef FAST_MEMCPY
sz = sz - OHDR_SIZE - 1 - 1;
- bcopy(_stringVal(self) + offs, dstp, sz);
+ bcopy(__stringVal(self) + offs, dstp, sz);
dstp += sz;
#else
# ifdef FAST_STRCPY
- strcpy(dstp, _stringVal(self) + offs);
+ strcpy(dstp, __stringVal(self) + offs);
dstp += sz - OHDR_SIZE - 1 - 1;
# else
{
REGISTER unsigned char *srcp;
- srcp = _stringVal(self) + offs;
+ srcp = __stringVal(self) + offs;
while ((*dstp = *srcp++) != '\0')
dstp++;
}
# endif
#endif
- *dstp++ = _intVal(_characterVal(aCharacter));
+ *dstp++ = __intVal(_characterVal(aCharacter));
*dstp = '\0';
RETURN (newString );
}
@@ -1609,11 +1609,11 @@
REGISTER int byteValue;
if (__isCharacter(aCharacter) && __isString(self)) {
- byteValue = _intVal(_characterVal(aCharacter));
+ byteValue = __intVal(_characterVal(aCharacter));
#ifdef FAST_MEMSET
- memset(_stringVal(self), byteValue, __qSize(self) - OHDR_SIZE - 1);
+ memset(__stringVal(self), byteValue, __qSize(self) - OHDR_SIZE - 1);
#else
- dst = _stringVal(self);
+ dst = __stringVal(self);
l = __qSize(self) - OHDR_SIZE - 1;
while (l >= 8) {
dst[0] = dst[1] = dst[2] = dst[3] = byteValue;
@@ -1647,9 +1647,9 @@
if (__isCharacter(oldCharacter)
&& __isCharacter(newCharacter)
&& __isString(self)) {
- srcp = (unsigned char *)_stringVal(self);
- oldVal = _intVal(_characterVal(oldCharacter));
- newVal = _intVal(_characterVal(newCharacter));
+ srcp = (unsigned char *)__stringVal(self);
+ oldVal = __intVal(_characterVal(oldCharacter));
+ newVal = __intVal(_characterVal(newCharacter));
while (*srcp) {
if (*srcp == oldVal)
*srcp = newVal;
@@ -1682,19 +1682,19 @@
if ((__isString(aString) || __isSymbol(aString))
&& __isString(self)
&& __bothSmallInteger(start, stop)) {
- len = _stringSize(self);
- index1 = _intVal(start);
- index2 = _intVal(stop);
+ len = __stringSize(self);
+ index1 = __intVal(start);
+ index2 = __intVal(stop);
count = index2 - index1 + 1;
if (count <= 0) {
RETURN (self);
}
if ((index2 <= len) && (index1 > 0)) {
- repLen = _stringSize(aString);
- repIndex = _intVal(repStart);
+ repLen = __stringSize(aString);
+ repIndex = __intVal(repStart);
if ((repIndex > 0) && ((repIndex + count - 1) <= repLen)) {
- srcp = _stringVal(aString) + repIndex - 1;
- dstp = _stringVal(self) + index1 - 1;
+ srcp = __stringVal(aString) + repIndex - 1;
+ dstp = __stringVal(self) + index1 - 1;
if (aString == self) {
/* take care of overlapping copy */
if (srcp < dstp) {
@@ -1734,8 +1734,8 @@
REGISTER unsigned char *hip, *lowp;
if (__isString(self)) {
- lowp = _stringVal(self);
- hip = lowp + _stringSize(self) - 1;
+ lowp = __stringVal(self);
+ hip = lowp + __stringSize(self) - 1;
while (lowp < hip) {
c = *lowp;
*lowp = *hip;
@@ -1766,7 +1766,7 @@
/* ignore instances of subclasses ... */
if (__qClass(self) == String) {
- cp = cp0 = _stringVal(self);
+ cp = cp0 = __stringVal(self);
while ((c = *cp)
#ifndef NON_ASCII /* i.e. EBCDIC ;-) */
&& (c <= ' ')
@@ -1776,7 +1776,7 @@
) {
cp++;
}
- startIndex = _MKSMALLINT(cp - cp0 + 1);
+ startIndex = __MKSMALLINT(cp - cp0 + 1);
cp = cp + strlen(cp) - 1;
while ((cp >= cp0) && (*cp == ' ')) cp--;
c = *cp;
@@ -1789,7 +1789,7 @@
cp--;
c = *cp;
}
- endIndex = _MKSMALLINT(cp - cp0 + 1);
+ endIndex = __MKSMALLINT(cp - cp0 + 1);
}
%}.
startIndex == 0 ifTrue:[^ super withoutSeparators].
@@ -1814,12 +1814,12 @@
/* ignore instances of subclasses ... */
if (__qClass(self) == String) {
- cp = cp0 = _stringVal(self);
+ cp = cp0 = __stringVal(self);
while (*cp == ' ') cp++;
- startIndex = _MKSMALLINT(cp - cp0 + 1);
+ startIndex = __MKSMALLINT(cp - cp0 + 1);
cp = cp + strlen(cp) - 1;
while ((cp >= cp0) && (*cp == ' ')) cp--;
- endIndex = _MKSMALLINT(cp - cp0 + 1);
+ endIndex = __MKSMALLINT(cp - cp0 + 1);
}
%}.
startIndex == 0 ifTrue:[^ super withoutSpaces].
@@ -1848,8 +1848,8 @@
RETURN ( false );
}
- src1 = _stringVal(self) + len1 - len2;
- src2 = _stringVal(aString);
+ src1 = __stringVal(self) + len1 - len2;
+ src2 = __stringVal(aString);
while (c = *src2++) {
if (c != *src1++) {
RETURN ( false );
@@ -1889,8 +1889,8 @@
RETURN ( false );
}
- src1 = _stringVal(self);
- src2 = _stringVal(aString);
+ src1 = __stringVal(self);
+ src2 = __stringVal(aString);
while (c = *src2++) {
if (c != *src1++) {
RETURN ( false );
@@ -1930,7 +1930,7 @@
%{ /* NOCONTEXT */
if (__qClass(self) == String) {
- fputs(_stringVal(self), stdout); fflush(stdout);
+ fputs(__stringVal(self), stdout); fflush(stdout);
RETURN (self);
}
%}
@@ -1959,13 +1959,13 @@
* manually save it here - very stupid ...
*/
- cp = (char *)_stringVal(self);
+ cp = (char *)__stringVal(self);
if (__qClass(self) != String)
- cp += __OBJS2BYTES__(_intVal(_ClassInstPtr(__qClass(self))->c_ninstvars));
+ cp += __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(self))->c_ninstvars));
__BEGIN_PROTECT_REGISTERS__
- sprintf(buffer, (char *)_stringVal(formatString), cp);
+ sprintf(buffer, (char *)__stringVal(formatString), cp);
__END_PROTECT_REGISTERS__
@@ -2044,7 +2044,7 @@
cls = __qClass(self);
if ((cls == String) || (cls == Symbol)) {
- RETURN ( (_stringSize(self) == 0) ? true : false);
+ RETURN ( (__stringSize(self) == 0) ? true : false);
}
%}
.
@@ -2056,7 +2056,7 @@
system - use to check for existance of a symbol without creating one"
%{ /* NOCONTEXT */
- RETURN ( __KNOWNASSYMBOL(_stringVal(self)) );
+ RETURN ( __KNOWNASSYMBOL(__stringVal(self)) );
%}
! !
@@ -2072,9 +2072,9 @@
REGISTER unsigned char c;
OBJ cls;
- src = _stringVal(self);
+ src = __stringVal(self);
if ((cls = __qClass(self)) != String)
- src += __OBJS2BYTES__(_intVal(_ClassInstPtr(cls)->c_ninstvars));
+ src += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
#ifndef NON_ASCII
while (*((unsigned *)src) == 0x20202020) {
@@ -2117,12 +2117,12 @@
&& (__isString(aString) || __isSymbol(aString))
&& __bothSmallInteger(insrtWeight, caseWeight)
&& __bothSmallInteger(substWeight, deleteWeight)) {
- iW = _intVal(insrtWeight);
- cW = _intVal(caseWeight);
- sW = _intVal(substWeight);
- dW = _intVal(deleteWeight);
- s1 = _stringVal(self);
- s2 = _stringVal(aString);
+ iW = __intVal(insrtWeight);
+ cW = __intVal(caseWeight);
+ sW = __intVal(substWeight);
+ dW = __intVal(deleteWeight);
+ s1 = __stringVal(self);
+ s2 = __stringVal(aString);
l1 = strlen(s1);
l2 = strlen(s2);
@@ -2175,7 +2175,7 @@
m = data[l1 * delta + l2];
if (sz > FASTSIZE)
free(data);
- RETURN ( _MKSMALLINT(m) );
+ RETURN ( __MKSMALLINT(m) );
}
mallocFailed: ;
}
@@ -2195,5 +2195,5 @@
!String class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.65 1996-02-26 13:13:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.66 1996-04-02 22:08:52 cg Exp $'
! !