--- a/Array.st Thu Jan 04 18:02:20 1996 +0100
+++ b/Array.st Fri Jan 05 13:33:18 1996 +0100
@@ -84,11 +84,11 @@
nInstVars += nindexedinstvars;
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
- if (_CanDoQuickAlignedNew(instsize)) {
+ if (__CanDoQuickAlignedNew(instsize)) {
/*
* the most common case
*/
- _qCheckedAlignedNew(newobj, instsize);
+ __qCheckedAlignedNew(newobj, instsize);
ok: ;
_InstPtr(newobj)->o_class = self;
__qSTORE(newobj, self);
@@ -172,7 +172,7 @@
* allocation failure)
*/
__PROTECT_CONTEXT__
- _qAlignedNew(newobj, instsize, SENDER);
+ __qAlignedNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj != nil) {
goto ok;
@@ -394,7 +394,7 @@
sz = __qSize(self) + sizeof(OBJ);
__PROTECT__(something);
__PROTECT__(self);
- _qAlignedNew(nObj, sz, __context);
+ __qAlignedNew(nObj, sz, __context);
__UNPROTECT__(self);
__UNPROTECT__(something);
@@ -1338,4 +1338,4 @@
!Array class methodsFor:'documentation'!
version
-^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.52 1996-01-04 17:02:07 cg Exp $'! !
+^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.53 1996-01-05 12:32:59 cg Exp $'! !
--- a/Behavior.st Thu Jan 04 18:02:20 1996 +0100
+++ b/Behavior.st Fri Jan 05 13:33:18 1996 +0100
@@ -1546,11 +1546,11 @@
case BYTEARRAY:
instsize = OHDR_SIZE + nindexedinstvars;
if (nInstVars == 0) {
- if (_CanDoQuickNew(instsize)) {
+ if (__CanDoQuickNew(instsize)) {
/*
* the most common case
*/
- _qCheckedNew(newobj, instsize);
+ __qCheckedNew(newobj, instsize);
_InstPtr(newobj)->o_class = self;
#if defined(memset4) && defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
nInstVars = nindexedinstvars >> 2;
@@ -1576,7 +1576,7 @@
instsize += __OBJS2BYTES__(nInstVars);
}
__PROTECT_CONTEXT__
- _qNew(newobj, instsize, SENDER);
+ __qNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
@@ -1616,7 +1616,7 @@
__OBJS2BYTES__(nInstVars) +
nindexedinstvars * sizeof(short);
__PROTECT_CONTEXT__
- _qNew(newobj, instsize, SENDER);
+ __qNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
@@ -1645,7 +1645,7 @@
__OBJS2BYTES__(nInstVars) +
nindexedinstvars * sizeof(long);
__PROTECT_CONTEXT__
- _qAlignedNew(newobj, instsize, SENDER);
+ __qAlignedNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
@@ -1682,7 +1682,7 @@
(nindexedinstvars - 1) * sizeof(float);
__PROTECT_CONTEXT__
- _qNew(newobj, instsize, SENDER);
+ __qNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
@@ -1709,7 +1709,7 @@
(nindexedinstvars - 1) * sizeof(double);
__PROTECT_CONTEXT__
- _qAlignedNew(newobj, instsize, SENDER);
+ __qAlignedNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
@@ -1739,7 +1739,7 @@
nInstVars += nindexedinstvars;
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
__PROTECT_CONTEXT__
- _qAlignedNew(newobj, instsize, SENDER);
+ __qAlignedNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
@@ -1828,7 +1828,7 @@
if (nindexedinstvars == 0) {
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
__PROTECT_CONTEXT__
- _qAlignedNew(newobj, instsize, SENDER);
+ __qAlignedNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
@@ -2978,5 +2978,5 @@
!Behavior class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.62 1996-01-04 17:02:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.63 1996-01-05 12:33:03 cg Exp $'
! !
--- a/ByteArray.st Thu Jan 04 18:02:20 1996 +0100
+++ b/ByteArray.st Fri Jan 05 13:33:18 1996 +0100
@@ -138,8 +138,8 @@
* the most common case
*/
instsize = OHDR_SIZE + nindexedinstvars;
- if (_CanDoQuickNew(instsize)) {
- _qCheckedNew(newobj, instsize);
+ if (__CanDoQuickNew(instsize)) {
+ __qCheckedNew(newobj, instsize);
_InstPtr(newobj)->o_class = self;
RETURN (newobj );
}
@@ -147,7 +147,7 @@
nInstVars = _intVal(_ClassInstPtr(self)->c_ninstvars);
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars) + nindexedinstvars;
__PROTECT_CONTEXT__
- _qNew(newobj, instsize, SENDER);
+ __qNew(newobj, instsize, SENDER);
__UNPROTECT_CONTEXT__
if (newobj != nil) {
_InstPtr(newobj)->o_class = self;
@@ -1170,7 +1170,7 @@
count = index2 - index1 + 1;
__PROTECT_CONTEXT__
sz = OHDR_SIZE + count;
- _qNew(newByteArray, sz, SENDER);
+ __qNew(newByteArray, sz, SENDER);
__UNPROTECT_CONTEXT__
if (newByteArray != nil) {
_InstPtr(newByteArray)->o_class = ByteArray;
@@ -2008,5 +2008,5 @@
!ByteArray class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ByteArray.st,v 1.42 1996-01-04 17:02:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ByteArray.st,v 1.43 1996-01-05 12:33:08 cg Exp $'
! !
--- a/Fraction.st Thu Jan 04 18:02:20 1996 +0100
+++ b/Fraction.st Fri Jan 05 13:33:18 1996 +0100
@@ -65,11 +65,11 @@
/* this check allows subclassing .. */
if (self == Fraction) {
- if (_CanDoQuickAlignedNew(sizeof(struct __fraction))) {
+ if (__CanDoQuickAlignedNew(sizeof(struct __fraction))) {
OBJ newFraction;
int spc;
- _qCheckedAlignedNew(newFraction, sizeof(struct __fraction));
+ __qCheckedAlignedNew(newFraction, sizeof(struct __fraction));
_InstPtr(newFraction)->o_class = Fraction;
_FractionInstPtr(newFraction)->f_numerator = num;
_FractionInstPtr(newFraction)->f_denominator = den;
@@ -470,6 +470,6 @@
!Fraction class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Fraction.st,v 1.25 1995-12-07 21:34:45 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Fraction.st,v 1.26 1996-01-05 12:33:10 cg Exp $'
! !
Fraction initialize!
--- a/Number.st Thu Jan 04 18:02:20 1996 +0100
+++ b/Number.st Fri Jan 05 13:33:18 1996 +0100
@@ -265,11 +265,11 @@
/*
* I cannot tell if this special code is worth anything
*/
- if (_CanDoQuickNew(sizeof(struct __point))) {
+ if (__CanDoQuickNew(sizeof(struct __point))) {
OBJ newPoint;
int spc;
- _qCheckedAlignedNew(newPoint, sizeof(struct __point));
+ __qCheckedAlignedNew(newPoint, sizeof(struct __point));
_InstPtr(newPoint)->o_class = Point;
_PointInstPtr(newPoint)->p_x = self;
_PointInstPtr(newPoint)->p_y = aNumber;
@@ -292,10 +292,10 @@
%{ /* NOCONTEXT */
- if (_CanDoQuickNew(sizeof(struct __point))) {
+ if (__CanDoQuickNew(sizeof(struct __point))) {
OBJ newPoint;
- _qCheckedAlignedNew(newPoint, sizeof(struct __point));
+ __qCheckedAlignedNew(newPoint, sizeof(struct __point));
_InstPtr(newPoint)->o_class = Point;
_PointInstPtr(newPoint)->p_x = self;
_PointInstPtr(newPoint)->p_y = self;
@@ -425,5 +425,5 @@
!Number class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Number.st,v 1.24 1995-12-07 21:36:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Number.st,v 1.25 1996-01-05 12:33:11 cg Exp $'
! !
--- a/Point.st Thu Jan 04 18:02:20 1996 +0100
+++ b/Point.st Fri Jan 05 13:33:18 1996 +0100
@@ -98,12 +98,12 @@
/*
* claus: I am no longer certain, if this primitive is worth the effort
*/
- if (_CanDoQuickNew(sizeof(struct __point))) {
+ if (__CanDoQuickNew(sizeof(struct __point))) {
if (self == Point) {
OBJ newPoint;
int spc;
- _qCheckedAlignedNew(newPoint, sizeof(struct __point));
+ __qCheckedAlignedNew(newPoint, sizeof(struct __point));
_InstPtr(newPoint)->o_class = Point;
_PointInstPtr(newPoint)->p_x = newX;
_PointInstPtr(newPoint)->p_y = newY;
@@ -854,6 +854,6 @@
!Point class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Point.st,v 1.30 1995-11-23 17:42:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Point.st,v 1.31 1996-01-05 12:33:13 cg Exp $'
! !
Point initialize!
--- a/Rectangle.st Thu Jan 04 18:02:20 1996 +0100
+++ b/Rectangle.st Fri Jan 05 13:33:18 1996 +0100
@@ -90,10 +90,12 @@
OBJ t;
int spc;
- if (_CanDoQuickNew(OHDR_SIZE + 4*sizeof(OBJ))) {
+ if (__CanDoQuickNew(OHDR_SIZE + 4*sizeof(OBJ))) {
if (self == Rectangle) {
- /* short cut - rectangles are created so often ... */
- _qCheckedAlignedNew(newRect, OHDR_SIZE + 4*sizeof(OBJ));
+ /*
+ * short cut - rectangles are created so often ...
+ */
+ __qCheckedAlignedNew(newRect, OHDR_SIZE + 4*sizeof(OBJ));
_InstPtr(newRect)->o_class = Rectangle;
_InstPtr(newRect)->i_instvars[0] = left;
@@ -132,11 +134,13 @@
OBJ t;
int spc;
- /* short cut - rectangles are created so often ... */
- if (_CanDoQuickNew(OHDR_SIZE + 4*sizeof(OBJ))) {
+ if (__CanDoQuickNew(OHDR_SIZE + 4*sizeof(OBJ))) {
+ /*
+ * short cut - rectangles are created so often ...
+ */
if (self == Rectangle) {
if (__isPoint(origin) && __isPoint(extent)) {
- _qCheckedAlignedNew(newRect, OHDR_SIZE + 4*sizeof(OBJ));
+ __qCheckedAlignedNew(newRect, OHDR_SIZE + 4*sizeof(OBJ));
_InstPtr(newRect)->o_class = Rectangle;
spc = __qSpace(newRect);
@@ -1145,5 +1149,5 @@
!Rectangle class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Rectangle.st,v 1.29 1996-01-04 01:23:33 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Rectangle.st,v 1.30 1996-01-05 12:33:15 cg Exp $'
! !
--- 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 $'
! !