diff -r 2ba9ca59f25d -r 5e3cb9e7e682 Array.st --- a/Array.st Fri Jan 24 14:10:21 1997 +0100 +++ b/Array.st Fri Jan 24 17:24:04 1997 +0100 @@ -549,7 +549,9 @@ */ REGISTER OBJFUNC codeVal; - if ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil) { + if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil) + && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))) { + #ifdef NEW_BLOCK_CALL # define BLOCK_ARG aBlock #else @@ -744,7 +746,9 @@ */ REGISTER OBJFUNC codeVal; - if ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil) { + if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil) + && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))) { + #ifdef NEW_BLOCK_CALL # define BLOCK_ARG aBlock #else @@ -1026,7 +1030,9 @@ */ REGISTER OBJFUNC codeVal; - if ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil) { + if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil) + && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))) { + #ifdef NEW_BLOCK_CALL # define BLOCK_ARG aBlock #else @@ -2157,5 +2163,5 @@ !Array class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.85 1997-01-21 15:07:08 cg Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.86 1997-01-24 16:23:03 cg Exp $' ! !