--- a/WeakArr.st Tue Oct 01 16:49:25 1996 +0200
+++ b/WeakArr.st Wed Oct 02 13:35:15 1996 +0200
@@ -305,10 +305,10 @@
&& (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
#ifdef NEW_BLOCK_CALL
for (; index < nIndex; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
- (*codeVal)(aBlock, CON_COMMA element);
+ (*codeVal)(aBlock, element);
}
#else
home = __BlockInstPtr(aBlock)->b_home;
@@ -318,31 +318,31 @@
* home will not move - keep in a fast register
*/
for (; index < nIndex; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
- (*codeVal)(rHome, CON_COMMA element);
+ (*codeVal)(rHome, element);
}
} else {
for (; index < nIndex; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
- (*codeVal)(home, CON_COMMA element);
+ (*codeVal)(home, element);
}
}
#endif
} else {
for (; index < nIndex; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
(*val.ilc_func)(aBlock,
@symbol(value:),
- CON_COMMA nil, &val,
+ nil, &val,
element);
}
}
@@ -380,10 +380,10 @@
&& (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
#ifdef NEW_BLOCK_CALL
for (index=indexLow; index <= indexHigh; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
- (*codeVal)(aBlock, CON_COMMA element);
+ (*codeVal)(aBlock, element);
}
#else
home = __BlockInstPtr(aBlock)->b_home;
@@ -391,28 +391,28 @@
if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
index = indexLow;
for (; index <= indexHigh; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
- (*codeVal)(rHome, CON_COMMA element);
+ (*codeVal)(rHome, element);
}
} else {
for (index=indexLow; index <= indexHigh; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
- (*codeVal)(home, CON_COMMA element);
+ (*codeVal)(home, element);
}
}
#endif
} else {
for (index=indexLow; index <= indexHigh; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
(*val.ilc_func) (aBlock,
@symbol(value:),
- CON_COMMA nil, &val,
+ nil, &val,
element);
}
}
@@ -445,11 +445,11 @@
&& (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(2))) {
#ifdef NEW_BLOCK_CALL
for (; index < nIndex; index++) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
- (*codeVal)(aBlock, CON_COMMA __MKSMALLINT(index+1), element);
+ (*codeVal)(aBlock, __MKSMALLINT(index+1), element);
}
#else
home = __BlockInstPtr(aBlock)->b_home;
@@ -459,34 +459,34 @@
* home will not move - keep in a fast register
*/
while (index < nIndex) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
index++;
- (*codeVal)(rHome, CON_COMMA __MKSMALLINT(index), element);
+ (*codeVal)(rHome, __MKSMALLINT(index), element);
}
} else {
while (index < nIndex) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
index++;
- (*codeVal)(home, CON_COMMA __MKSMALLINT(index), element);
+ (*codeVal)(home, __MKSMALLINT(index), element);
}
}
#endif
} else {
while (index < nIndex) {
- if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+ if (InterruptPending != nil) __interruptL(@line);
element = __InstPtr(self)->i_instvars[index];
if (element != nil) element = __WEAK_READ__(self, element);
index++;
(*val2.ilc_func)(aBlock,
@symbol(value:value:),
- CON_COMMA nil, &val2,
+ nil, &val2,
__MKSMALLINT(index),
element);
}
@@ -519,7 +519,7 @@
if (element != nil) {
element = __WEAK_READ__(self, element);
if (element != nil) {
- (*codeVal)(aBlock, CON_COMMA element);
+ (*codeVal)(aBlock, element);
}
}
}
@@ -537,7 +537,7 @@
if (element != nil) {
element = __WEAK_READ__(self, element);
if (element != nil) {
- (*codeVal)(rHome, CON_COMMA element);
+ (*codeVal)(rHome, element);
}
}
}
@@ -549,7 +549,7 @@
if (element != nil) {
element = __WEAK_READ__(self, element);
if (element != nil) {
- (*codeVal)(home, CON_COMMA element);
+ (*codeVal)(home, element);
}
}
}
@@ -565,7 +565,7 @@
if (element != nil) {
(*val.ilc_func)(aBlock,
@symbol(value:),
- CON_COMMA nil, &val,
+ nil, &val,
element);
}
}
@@ -592,6 +592,6 @@
!WeakArray class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Attic/WeakArr.st,v 1.30 1996-04-25 16:14:17 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Attic/WeakArr.st,v 1.31 1996-10-02 11:35:15 cg Exp $'
! !
WeakArray initialize!