# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 828483295 -7200
# Node ID 898af060dfde54c3c45f4bfad859f248d516d1a7
# Parent  7fcefc747f0037a722d4259e2d75c9a79125f778
underline cleanup

diff -r 7fcefc747f00 -r 898af060dfde WeakArr.st
--- a/WeakArr.st	Wed Apr 03 00:12:47 1996 +0200
+++ b/WeakArr.st	Wed Apr 03 00:14:55 1996 +0200
@@ -225,12 +225,12 @@
     extern OBJ __WEAK_READ__();
 
     if (__isSmallInteger(index)) {
-	indx = _intVal(index) - 1;
+	indx = __intVal(index) - 1;
 	if (indx >= 0) {
 	    nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
-	    indx += _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+	    indx += __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
 	    if (indx < nIndex) {
-		el = _InstPtr(self)->i_instvars[indx];
+		el = __InstPtr(self)->i_instvars[indx];
 		if (el != nil) el = __WEAK_READ__(self, el);
 		RETURN (el );
 	    }
@@ -294,20 +294,20 @@
     REGISTER OBJ rHome;
     extern OBJ __WEAK_READ__();
 
-    index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+    index = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
     nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
     if (__isBlockLike(aBlock)
-     && ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-     && (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
+     && ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+     && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
 #ifdef NEW_BLOCK_CALL
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) element = __WEAK_READ__(self, element);
 	    (*codeVal)(aBlock, CON_COMMA  element);
 	} 
 #else
-	home = _BlockInstPtr(aBlock)->b_home;
+	home = __BlockInstPtr(aBlock)->b_home;
 	rHome = home;
 	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
 	    /*
@@ -316,7 +316,7 @@
 	    for (; index < nIndex; index++) {
 		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) element = __WEAK_READ__(self, element);
 		(*codeVal)(rHome, CON_COMMA  element);
 	    } 
@@ -324,7 +324,7 @@
 	    for (; index < nIndex; index++) {
 		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) element = __WEAK_READ__(self, element);
 		(*codeVal)(home, CON_COMMA  element);
 	    } 
@@ -334,7 +334,7 @@
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) element = __WEAK_READ__(self, element);
 	    (*val.ilc_func)(aBlock, 
 			    @symbol(value:), 
@@ -362,10 +362,10 @@
     extern OBJ __WEAK_READ__();
 
     if (__bothSmallInteger(start, stop)) {
-	indexLow = _intVal(start);
+	indexLow = __intVal(start);
 	if (indexLow > 0) {
-	    indexHigh = _intVal(stop);
-	    nInsts = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+	    indexHigh = __intVal(stop);
+	    nInsts = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
 	    indexLow += nInsts;
 	    indexHigh += nInsts;
 	    nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
@@ -373,30 +373,30 @@
 		indexLow--;
 		indexHigh--;
 		if (__isBlockLike(aBlock)
-		 && ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-		 && (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
+		 && ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+		 && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
 #ifdef NEW_BLOCK_CALL
 		    for (index=indexLow; index <= indexHigh; index++) {
 			if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-			element = _InstPtr(self)->i_instvars[index];
+			element = __InstPtr(self)->i_instvars[index];
 			if (element != nil) element = __WEAK_READ__(self, element);
 			(*codeVal)(aBlock, CON_COMMA  element);
 		    } 
 #else
-		    home = _BlockInstPtr(aBlock)->b_home;
+		    home = __BlockInstPtr(aBlock)->b_home;
 		    rHome = home;
 		    if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
 			index = indexLow;
 			for (; index <= indexHigh; index++) {
 			    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-			    element = _InstPtr(self)->i_instvars[index];
+			    element = __InstPtr(self)->i_instvars[index];
 			    if (element != nil) element = __WEAK_READ__(self, element);
 			    (*codeVal)(rHome, CON_COMMA  element);
 			} 
 		    } else {
 			for (index=indexLow; index <= indexHigh; index++) {
 			    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-			    element = _InstPtr(self)->i_instvars[index];
+			    element = __InstPtr(self)->i_instvars[index];
 			    if (element != nil) element = __WEAK_READ__(self, element);
 			    (*codeVal)(home, CON_COMMA  element);
 			} 
@@ -405,7 +405,7 @@
 		} else {
 		    for (index=indexLow; index <= indexHigh; index++) {
 			if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-			element = _InstPtr(self)->i_instvars[index];
+			element = __InstPtr(self)->i_instvars[index];
 			if (element != nil) element = __WEAK_READ__(self, element);
 			(*val.ilc_func) (aBlock, 
 					 @symbol(value:), 
@@ -436,21 +436,21 @@
     REGISTER OBJ rHome;
     extern OBJ __WEAK_READ__();
 
-    index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+    index = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
     nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
     if (__isBlockLike(aBlock)
-     && ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-     && (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(2))) {
+     && ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+     && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(2))) {
 #ifdef NEW_BLOCK_CALL
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) element = __WEAK_READ__(self, element);
 	    (*codeVal)(aBlock, CON_COMMA  __MKSMALLINT(index+1), element);
 	} 
 #else
-	home = _BlockInstPtr(aBlock)->b_home;
+	home = __BlockInstPtr(aBlock)->b_home;
 	rHome = home;
 	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
 	    /*
@@ -459,7 +459,7 @@
 	    while (index < nIndex) {
 		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) element = __WEAK_READ__(self, element);
 		index++;
 		(*codeVal)(rHome, CON_COMMA  __MKSMALLINT(index), element);
@@ -468,7 +468,7 @@
 	    while (index < nIndex) {
 		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) element = __WEAK_READ__(self, element);
 		index++;
 		(*codeVal)(home, CON_COMMA  __MKSMALLINT(index), element);
@@ -479,7 +479,7 @@
 	while (index < nIndex) {
 	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) element = __WEAK_READ__(self, element);
 	    index++;
 	    (*val2.ilc_func)(aBlock, 
@@ -505,16 +505,16 @@
     REGISTER OBJ rHome;
     extern OBJ __WEAK_READ__();
 
-    index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+    index = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
     nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
     if (__isBlockLike(aBlock)
-     && ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-     && (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
+     && ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+     && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
 #ifdef NEW_BLOCK_CALL
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(CONARG);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) {
 		element = __WEAK_READ__(self, element);
 		if (element != nil) {
@@ -523,7 +523,7 @@
 	    }
 	} 
 #else
-	home = _BlockInstPtr(aBlock)->b_home;
+	home = __BlockInstPtr(aBlock)->b_home;
 	rHome = home;
 	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
 	    /*
@@ -532,7 +532,7 @@
 	    for (; index < nIndex; index++) {
 		if (InterruptPending != nil) __interruptL(CONARG);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) {
 		    element = __WEAK_READ__(self, element);
 		    if (element != nil) {
@@ -544,7 +544,7 @@
 	    for (; index < nIndex; index++) {
 		if (InterruptPending != nil) __interruptL(@line CONARG);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) {
 		    element = __WEAK_READ__(self, element);
 		    if (element != nil) {
@@ -558,7 +558,7 @@
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(@line CONARG);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) {
 		element = __WEAK_READ__(self, element);
 		if (element != nil) {
@@ -591,6 +591,6 @@
 !WeakArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/WeakArr.st,v 1.26 1996-03-27 01:25:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/WeakArr.st,v 1.27 1996-04-02 22:14:17 cg Exp $'
 ! !
 WeakArray initialize!
diff -r 7fcefc747f00 -r 898af060dfde WeakArray.st
--- a/WeakArray.st	Wed Apr 03 00:12:47 1996 +0200
+++ b/WeakArray.st	Wed Apr 03 00:14:55 1996 +0200
@@ -225,12 +225,12 @@
     extern OBJ __WEAK_READ__();
 
     if (__isSmallInteger(index)) {
-	indx = _intVal(index) - 1;
+	indx = __intVal(index) - 1;
 	if (indx >= 0) {
 	    nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
-	    indx += _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+	    indx += __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
 	    if (indx < nIndex) {
-		el = _InstPtr(self)->i_instvars[indx];
+		el = __InstPtr(self)->i_instvars[indx];
 		if (el != nil) el = __WEAK_READ__(self, el);
 		RETURN (el );
 	    }
@@ -294,20 +294,20 @@
     REGISTER OBJ rHome;
     extern OBJ __WEAK_READ__();
 
-    index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+    index = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
     nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
     if (__isBlockLike(aBlock)
-     && ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-     && (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
+     && ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+     && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
 #ifdef NEW_BLOCK_CALL
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) element = __WEAK_READ__(self, element);
 	    (*codeVal)(aBlock, CON_COMMA  element);
 	} 
 #else
-	home = _BlockInstPtr(aBlock)->b_home;
+	home = __BlockInstPtr(aBlock)->b_home;
 	rHome = home;
 	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
 	    /*
@@ -316,7 +316,7 @@
 	    for (; index < nIndex; index++) {
 		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) element = __WEAK_READ__(self, element);
 		(*codeVal)(rHome, CON_COMMA  element);
 	    } 
@@ -324,7 +324,7 @@
 	    for (; index < nIndex; index++) {
 		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) element = __WEAK_READ__(self, element);
 		(*codeVal)(home, CON_COMMA  element);
 	    } 
@@ -334,7 +334,7 @@
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) element = __WEAK_READ__(self, element);
 	    (*val.ilc_func)(aBlock, 
 			    @symbol(value:), 
@@ -362,10 +362,10 @@
     extern OBJ __WEAK_READ__();
 
     if (__bothSmallInteger(start, stop)) {
-	indexLow = _intVal(start);
+	indexLow = __intVal(start);
 	if (indexLow > 0) {
-	    indexHigh = _intVal(stop);
-	    nInsts = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+	    indexHigh = __intVal(stop);
+	    nInsts = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
 	    indexLow += nInsts;
 	    indexHigh += nInsts;
 	    nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
@@ -373,30 +373,30 @@
 		indexLow--;
 		indexHigh--;
 		if (__isBlockLike(aBlock)
-		 && ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-		 && (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
+		 && ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+		 && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
 #ifdef NEW_BLOCK_CALL
 		    for (index=indexLow; index <= indexHigh; index++) {
 			if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-			element = _InstPtr(self)->i_instvars[index];
+			element = __InstPtr(self)->i_instvars[index];
 			if (element != nil) element = __WEAK_READ__(self, element);
 			(*codeVal)(aBlock, CON_COMMA  element);
 		    } 
 #else
-		    home = _BlockInstPtr(aBlock)->b_home;
+		    home = __BlockInstPtr(aBlock)->b_home;
 		    rHome = home;
 		    if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
 			index = indexLow;
 			for (; index <= indexHigh; index++) {
 			    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-			    element = _InstPtr(self)->i_instvars[index];
+			    element = __InstPtr(self)->i_instvars[index];
 			    if (element != nil) element = __WEAK_READ__(self, element);
 			    (*codeVal)(rHome, CON_COMMA  element);
 			} 
 		    } else {
 			for (index=indexLow; index <= indexHigh; index++) {
 			    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-			    element = _InstPtr(self)->i_instvars[index];
+			    element = __InstPtr(self)->i_instvars[index];
 			    if (element != nil) element = __WEAK_READ__(self, element);
 			    (*codeVal)(home, CON_COMMA  element);
 			} 
@@ -405,7 +405,7 @@
 		} else {
 		    for (index=indexLow; index <= indexHigh; index++) {
 			if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-			element = _InstPtr(self)->i_instvars[index];
+			element = __InstPtr(self)->i_instvars[index];
 			if (element != nil) element = __WEAK_READ__(self, element);
 			(*val.ilc_func) (aBlock, 
 					 @symbol(value:), 
@@ -436,21 +436,21 @@
     REGISTER OBJ rHome;
     extern OBJ __WEAK_READ__();
 
-    index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+    index = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
     nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
     if (__isBlockLike(aBlock)
-     && ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-     && (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(2))) {
+     && ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+     && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(2))) {
 #ifdef NEW_BLOCK_CALL
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) element = __WEAK_READ__(self, element);
 	    (*codeVal)(aBlock, CON_COMMA  __MKSMALLINT(index+1), element);
 	} 
 #else
-	home = _BlockInstPtr(aBlock)->b_home;
+	home = __BlockInstPtr(aBlock)->b_home;
 	rHome = home;
 	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
 	    /*
@@ -459,7 +459,7 @@
 	    while (index < nIndex) {
 		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) element = __WEAK_READ__(self, element);
 		index++;
 		(*codeVal)(rHome, CON_COMMA  __MKSMALLINT(index), element);
@@ -468,7 +468,7 @@
 	    while (index < nIndex) {
 		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) element = __WEAK_READ__(self, element);
 		index++;
 		(*codeVal)(home, CON_COMMA  __MKSMALLINT(index), element);
@@ -479,7 +479,7 @@
 	while (index < nIndex) {
 	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) element = __WEAK_READ__(self, element);
 	    index++;
 	    (*val2.ilc_func)(aBlock, 
@@ -505,16 +505,16 @@
     REGISTER OBJ rHome;
     extern OBJ __WEAK_READ__();
 
-    index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+    index = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
     nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
     if (__isBlockLike(aBlock)
-     && ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-     && (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
+     && ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+     && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
 #ifdef NEW_BLOCK_CALL
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(CONARG);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) {
 		element = __WEAK_READ__(self, element);
 		if (element != nil) {
@@ -523,7 +523,7 @@
 	    }
 	} 
 #else
-	home = _BlockInstPtr(aBlock)->b_home;
+	home = __BlockInstPtr(aBlock)->b_home;
 	rHome = home;
 	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
 	    /*
@@ -532,7 +532,7 @@
 	    for (; index < nIndex; index++) {
 		if (InterruptPending != nil) __interruptL(CONARG);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) {
 		    element = __WEAK_READ__(self, element);
 		    if (element != nil) {
@@ -544,7 +544,7 @@
 	    for (; index < nIndex; index++) {
 		if (InterruptPending != nil) __interruptL(@line CONARG);
 
-		element = _InstPtr(self)->i_instvars[index];
+		element = __InstPtr(self)->i_instvars[index];
 		if (element != nil) {
 		    element = __WEAK_READ__(self, element);
 		    if (element != nil) {
@@ -558,7 +558,7 @@
 	for (; index < nIndex; index++) {
 	    if (InterruptPending != nil) __interruptL(@line CONARG);
 
-	    element = _InstPtr(self)->i_instvars[index];
+	    element = __InstPtr(self)->i_instvars[index];
 	    if (element != nil) {
 		element = __WEAK_READ__(self, element);
 		if (element != nil) {
@@ -591,6 +591,6 @@
 !WeakArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/WeakArray.st,v 1.26 1996-03-27 01:25:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/WeakArray.st,v 1.27 1996-04-02 22:14:17 cg Exp $'
 ! !
 WeakArray initialize!
diff -r 7fcefc747f00 -r 898af060dfde WriteStr.st
--- a/WriteStr.st	Wed Apr 03 00:12:47 1996 +0200
+++ b/WriteStr.st	Wed Apr 03 00:14:55 1996 +0200
@@ -205,30 +205,30 @@
     OBJ coll;
     OBJ p, l;
 
-    coll = _INST(collection);
-    p = _INST(position);
+    coll = __INST(collection);
+    p = __INST(position);
 
     if (__isNonNilObject(coll) && __isSmallInteger(p)) {
 
-	pos = _intVal(p);
-	l = _INST(writeLimit);
+	pos = __intVal(p);
+	l = __INST(writeLimit);
 
 	if ((l == nil)
-	 || (__isSmallInteger(l) && (pos <= _intVal(l)))) {
+	 || (__isSmallInteger(l) && (pos <= __intVal(l)))) {
 	    OBJ cls;
 
 	    cls = __qClass(coll);
 
 	    if (cls == @global(String)) {
 		if (__isCharacter(anObject) 
-		 && (pos <= _stringSize(coll))) {
-		    ch = _intVal(_characterVal(anObject));
+		 && (pos <= __stringSize(coll))) {
+		    ch = __intVal(_characterVal(anObject));
 		    if ((ch >= 0) && (ch <= 255)) {
-			_StringInstPtr(coll)->s_element[pos-1] = ch;
-			_INST(position) = _MKSMALLINT(pos + 1);
-			if (__isSmallInteger(_INST(readLimit))
-			 && (pos >= _intVal(_INST(readLimit)))) {
-			    _INST(readLimit) = _MKSMALLINT(pos);
+			__StringInstPtr(coll)->s_element[pos-1] = ch;
+			__INST(position) = __MKSMALLINT(pos + 1);
+			if (__isSmallInteger(__INST(readLimit))
+			 && (pos >= __intVal(__INST(readLimit)))) {
+			    __INST(readLimit) = __MKSMALLINT(pos);
 			}
 			RETURN ( anObject );
 		    }
@@ -236,26 +236,26 @@
 	    } else {
 		if (cls == @global(ByteArray)) {
 		    if (__isSmallInteger(anObject) 
-		     && ((ch = _intVal(anObject)) >= 0)
+		     && ((ch = __intVal(anObject)) >= 0)
 		     && (ch <= 255)
 		     && (pos <= _byteArraySize(coll))) {
-			_ByteArrayInstPtr(coll)->ba_element[pos-1] = ch;
-			_INST(position) = _MKSMALLINT(pos + 1);
-			if (__isSmallInteger(_INST(readLimit))
-			 && (pos >= _intVal(_INST(readLimit)))) {
-			    _INST(readLimit) = _MKSMALLINT(pos);
+			__ByteArrayInstPtr(coll)->ba_element[pos-1] = ch;
+			__INST(position) = __MKSMALLINT(pos + 1);
+			if (__isSmallInteger(__INST(readLimit))
+			 && (pos >= __intVal(__INST(readLimit)))) {
+			    __INST(readLimit) = __MKSMALLINT(pos);
 			}
 			RETURN ( anObject );
 		    }
 		} else {
 		    if (cls == @global(Array)) {
 			if (pos <= _arraySize(coll)) {
-			     _ArrayInstPtr(coll)->a_element[pos-1] = anObject;
+			     __ArrayInstPtr(coll)->a_element[pos-1] = anObject;
 			    __STORE(coll, anObject);
-			    _INST(position) = _MKSMALLINT(pos + 1);
-			    if (__isSmallInteger(_INST(readLimit))
-			     && (pos >= _intVal(_INST(readLimit)))) {
-				_INST(readLimit) = _MKSMALLINT(pos);
+			    __INST(position) = __MKSMALLINT(pos + 1);
+			    if (__isSmallInteger(__INST(readLimit))
+			     && (pos >= __intVal(__INST(readLimit)))) {
+				__INST(readLimit) = __MKSMALLINT(pos);
 			    }
 			    RETURN ( anObject );
 			}
@@ -311,5 +311,5 @@
 !WriteStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/WriteStr.st,v 1.24 1996-01-05 14:21:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/WriteStr.st,v 1.25 1996-04-02 22:14:55 cg Exp $'
 ! !
diff -r 7fcefc747f00 -r 898af060dfde WriteStream.st
--- a/WriteStream.st	Wed Apr 03 00:12:47 1996 +0200
+++ b/WriteStream.st	Wed Apr 03 00:14:55 1996 +0200
@@ -205,30 +205,30 @@
     OBJ coll;
     OBJ p, l;
 
-    coll = _INST(collection);
-    p = _INST(position);
+    coll = __INST(collection);
+    p = __INST(position);
 
     if (__isNonNilObject(coll) && __isSmallInteger(p)) {
 
-	pos = _intVal(p);
-	l = _INST(writeLimit);
+	pos = __intVal(p);
+	l = __INST(writeLimit);
 
 	if ((l == nil)
-	 || (__isSmallInteger(l) && (pos <= _intVal(l)))) {
+	 || (__isSmallInteger(l) && (pos <= __intVal(l)))) {
 	    OBJ cls;
 
 	    cls = __qClass(coll);
 
 	    if (cls == @global(String)) {
 		if (__isCharacter(anObject) 
-		 && (pos <= _stringSize(coll))) {
-		    ch = _intVal(_characterVal(anObject));
+		 && (pos <= __stringSize(coll))) {
+		    ch = __intVal(_characterVal(anObject));
 		    if ((ch >= 0) && (ch <= 255)) {
-			_StringInstPtr(coll)->s_element[pos-1] = ch;
-			_INST(position) = _MKSMALLINT(pos + 1);
-			if (__isSmallInteger(_INST(readLimit))
-			 && (pos >= _intVal(_INST(readLimit)))) {
-			    _INST(readLimit) = _MKSMALLINT(pos);
+			__StringInstPtr(coll)->s_element[pos-1] = ch;
+			__INST(position) = __MKSMALLINT(pos + 1);
+			if (__isSmallInteger(__INST(readLimit))
+			 && (pos >= __intVal(__INST(readLimit)))) {
+			    __INST(readLimit) = __MKSMALLINT(pos);
 			}
 			RETURN ( anObject );
 		    }
@@ -236,26 +236,26 @@
 	    } else {
 		if (cls == @global(ByteArray)) {
 		    if (__isSmallInteger(anObject) 
-		     && ((ch = _intVal(anObject)) >= 0)
+		     && ((ch = __intVal(anObject)) >= 0)
 		     && (ch <= 255)
 		     && (pos <= _byteArraySize(coll))) {
-			_ByteArrayInstPtr(coll)->ba_element[pos-1] = ch;
-			_INST(position) = _MKSMALLINT(pos + 1);
-			if (__isSmallInteger(_INST(readLimit))
-			 && (pos >= _intVal(_INST(readLimit)))) {
-			    _INST(readLimit) = _MKSMALLINT(pos);
+			__ByteArrayInstPtr(coll)->ba_element[pos-1] = ch;
+			__INST(position) = __MKSMALLINT(pos + 1);
+			if (__isSmallInteger(__INST(readLimit))
+			 && (pos >= __intVal(__INST(readLimit)))) {
+			    __INST(readLimit) = __MKSMALLINT(pos);
 			}
 			RETURN ( anObject );
 		    }
 		} else {
 		    if (cls == @global(Array)) {
 			if (pos <= _arraySize(coll)) {
-			     _ArrayInstPtr(coll)->a_element[pos-1] = anObject;
+			     __ArrayInstPtr(coll)->a_element[pos-1] = anObject;
 			    __STORE(coll, anObject);
-			    _INST(position) = _MKSMALLINT(pos + 1);
-			    if (__isSmallInteger(_INST(readLimit))
-			     && (pos >= _intVal(_INST(readLimit)))) {
-				_INST(readLimit) = _MKSMALLINT(pos);
+			    __INST(position) = __MKSMALLINT(pos + 1);
+			    if (__isSmallInteger(__INST(readLimit))
+			     && (pos >= __intVal(__INST(readLimit)))) {
+				__INST(readLimit) = __MKSMALLINT(pos);
 			    }
 			    RETURN ( anObject );
 			}
@@ -311,5 +311,5 @@
 !WriteStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/WriteStream.st,v 1.24 1996-01-05 14:21:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/WriteStream.st,v 1.25 1996-04-02 22:14:55 cg Exp $'
 ! !