--- a/Array.st Thu Jan 04 12:12:03 1996 +0100
+++ b/Array.st Thu Jan 04 18:02:20 1996 +0100
@@ -171,9 +171,9 @@
* (especially for self, but also for backtrace in case of
* allocation failure)
*/
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qAlignedNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj != nil) {
goto ok;
}
@@ -392,11 +392,11 @@
if (__qClass(self) == Array) {
sz = __qSize(self) + sizeof(OBJ);
- PROTECT(something);
- PROTECT(self);
+ __PROTECT__(something);
+ __PROTECT__(self);
_qAlignedNew(nObj, sz, __context);
- UNPROTECT(self);
- UNPROTECT(something);
+ __UNPROTECT__(self);
+ __UNPROTECT__(something);
if (nObj) {
_InstPtr(nObj)->o_class = Array;
@@ -1338,4 +1338,4 @@
!Array class methodsFor:'documentation'!
version
-^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.51 1996-01-04 01:22:40 cg Exp $'! !
+^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.52 1996-01-04 17:02:07 cg Exp $'! !
--- a/Behavior.st Thu Jan 04 12:12:03 1996 +0100
+++ b/Behavior.st Thu Jan 04 18:02:20 1996 +0100
@@ -1499,9 +1499,9 @@
/*
* the slow case - a GC will occur
*/
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
newobj = __new(instsize);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj != nil) goto ok;
%}
.
@@ -1575,9 +1575,9 @@
} else {
instsize += __OBJS2BYTES__(nInstVars);
}
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
}
@@ -1615,9 +1615,9 @@
instsize = OHDR_SIZE +
__OBJS2BYTES__(nInstVars) +
nindexedinstvars * sizeof(short);
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
}
@@ -1644,9 +1644,9 @@
instsize = OHDR_SIZE +
__OBJS2BYTES__(nInstVars) +
nindexedinstvars * sizeof(long);
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qAlignedNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
}
@@ -1681,9 +1681,9 @@
__OBJS2BYTES__(nInstVars) +
(nindexedinstvars - 1) * sizeof(float);
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
}
@@ -1708,9 +1708,9 @@
__OBJS2BYTES__(nInstVars) +
(nindexedinstvars - 1) * sizeof(double);
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qAlignedNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
}
@@ -1738,9 +1738,9 @@
case POINTERARRAY:
nInstVars += nindexedinstvars;
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qAlignedNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
}
@@ -1827,9 +1827,9 @@
*/
if (nindexedinstvars == 0) {
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qAlignedNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj == nil) {
break;
}
@@ -2978,5 +2978,5 @@
!Behavior class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.61 1996-01-04 01:22:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.62 1996-01-04 17:02:11 cg Exp $'
! !
--- a/ByteArray.st Thu Jan 04 12:12:03 1996 +0100
+++ b/ByteArray.st Thu Jan 04 18:02:20 1996 +0100
@@ -146,9 +146,9 @@
}
nInstVars = _intVal(_ClassInstPtr(self)->c_ninstvars);
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars) + nindexedinstvars;
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qNew(newobj, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newobj != nil) {
_InstPtr(newobj)->o_class = self;
__qSTORE(newobj, self);
@@ -1168,10 +1168,10 @@
if ((index1 <= index2) && (index1 > 0)) {
if (index2 <= len) {
count = index2 - index1 + 1;
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
sz = OHDR_SIZE + count;
_qNew(newByteArray, sz, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newByteArray != nil) {
_InstPtr(newByteArray)->o_class = ByteArray;
dstp = _ByteArrayInstPtr(newByteArray)->ba_element;
@@ -2008,5 +2008,5 @@
!ByteArray class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ByteArray.st,v 1.41 1996-01-04 01:22:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ByteArray.st,v 1.42 1996-01-04 17:02:16 cg Exp $'
! !
--- a/String.st Thu Jan 04 12:12:03 1996 +0100
+++ b/String.st Thu Jan 04 18:02:20 1996 +0100
@@ -136,9 +136,9 @@
instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars) + len + 1;
}
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qNew(newString, instsize, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newString == nil) goto fail;
_InstPtr(newString)->o_class = self;
__qSTORE(newString, self);
@@ -1378,10 +1378,10 @@
}
if (index1 <= len) {
count = len - index1 + 1;
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
sz = OHDR_SIZE + count + 1;
_qNew(newString, sz, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newString != nil) {
_InstPtr(newString)->o_class = String;
dstp = _stringVal(newString);
@@ -1442,10 +1442,10 @@
}
if (index2 <= len) {
count = index2 - index1 + 1;
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
sz = OHDR_SIZE + count + 1;
_qNew(newString, sz, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newString != nil) {
_InstPtr(newString)->o_class = String;
dstp = _stringVal(newString);
@@ -1472,9 +1472,9 @@
* allow empty copy
*/
if (index1 > index2) {
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qNew(newString, OHDR_SIZE+1, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newString != nil) {
_InstPtr(newString)->o_class = String;
__stringVal(newString)[0] = '\0';
@@ -1511,9 +1511,9 @@
} else
offs = 0;
- PROTECT_CONTEXT
+ __PROTECT_CONTEXT__
_qNew(newString, sz, SENDER);
- UNPROTECT_CONTEXT
+ __UNPROTECT_CONTEXT__
if (newString) {
_InstPtr(newString)->o_class = String;
dstp = _stringVal(newString);
@@ -2194,5 +2194,5 @@
!String class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.58 1996-01-04 11:12:03 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.59 1996-01-04 17:02:20 cg Exp $'
! !