--- a/String.st Thu Jan 04 18:02:20 1996 +0100
+++ b/String.st Fri Jan 05 13:33:18 1996 +0100
@@ -93,11 +93,11 @@
if (len >= 0) {
if (self == String) {
instsize = OHDR_SIZE + len + 1;
- if (_CanDoQuickNew(instsize)) {
+ if (__CanDoQuickNew(instsize)) {
/*
* the most common case
*/
- _qCheckedNew(newString, instsize);
+ __qCheckedNew(newString, instsize);
_InstPtr(newString)->o_class = self;
__qSTORE(newString, self);
@@ -137,7 +137,7 @@
}
__PROTECT_CONTEXT__
- _qNew(newString, instsize, SENDER);
+ ___qNew(newString, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newString == nil) goto fail;
_InstPtr(newString)->o_class = self;
@@ -1137,7 +1137,7 @@
* get the string
*/
sz = OHDR_SIZE + sz + 1;
- _qNew(newString, sz, __context);
+ __qNew(newString, sz, __context);
if (newString != nil) {
_InstPtr(newString)->o_class = String;
@@ -1212,7 +1212,7 @@
}
sz = OHDR_SIZE + l1 + l2 + 1;
- _qNew(newString, sz, __context);
+ __qNew(newString, sz, __context);
if (newString != nil) {
_InstPtr(newString)->o_class = String;
dstp = _stringVal(newString);
@@ -1262,7 +1262,7 @@
len2 = _stringSize(string1);
len3 = _stringSize(string2);
sz = OHDR_SIZE + len1 + len2 + len3 + 1;
- _qNew(newString, sz, __context);
+ __qNew(newString, sz, __context);
if (newString != nil) {
_InstPtr(newString)->o_class = String;
dstp = _stringVal(newString);
@@ -1315,7 +1315,7 @@
len3 = _stringSize(string2);
len4 = _stringSize(string3);
sz = OHDR_SIZE + len1 + len2 + len3 + len4 + 1;
- _qNew(newString, sz, __context);
+ __qNew(newString, sz, __context);
if (newString != nil) {
_InstPtr(newString)->o_class = String;
dstp = _stringVal(newString);
@@ -1380,7 +1380,7 @@
count = len - index1 + 1;
__PROTECT_CONTEXT__
sz = OHDR_SIZE + count + 1;
- _qNew(newString, sz, SENDER);
+ __qNew(newString, sz, SENDER);
__UNPROTECT_CONTEXT__
if (newString != nil) {
_InstPtr(newString)->o_class = String;
@@ -1444,7 +1444,7 @@
count = index2 - index1 + 1;
__PROTECT_CONTEXT__
sz = OHDR_SIZE + count + 1;
- _qNew(newString, sz, SENDER);
+ __qNew(newString, sz, SENDER);
__UNPROTECT_CONTEXT__
if (newString != nil) {
_InstPtr(newString)->o_class = String;
@@ -1473,7 +1473,7 @@
*/
if (index1 > index2) {
__PROTECT_CONTEXT__
- _qNew(newString, OHDR_SIZE+1, SENDER);
+ __qNew(newString, OHDR_SIZE+1, SENDER);
__UNPROTECT_CONTEXT__
if (newString != nil) {
_InstPtr(newString)->o_class = String;
@@ -1512,7 +1512,7 @@
offs = 0;
__PROTECT_CONTEXT__
- _qNew(newString, sz, SENDER);
+ __qNew(newString, sz, SENDER);
__UNPROTECT_CONTEXT__
if (newString) {
_InstPtr(newString)->o_class = String;
@@ -2194,5 +2194,5 @@
!String class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.59 1996-01-04 17:02:20 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.60 1996-01-05 12:33:18 cg Exp $'
! !