diff -r b09ce8542506 -r 961f2b095c22 Block.st
--- a/Block.st	Tue Apr 02 18:30:51 1996 +0200
+++ b/Block.st	Wed Apr 03 00:06:56 1996 +0200
@@ -81,7 +81,7 @@
 !
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.46 1996-02-29 02:23:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.47 1996-04-02 21:59:04 cg Exp $'
 ! !
 
 !Block class methodsFor:'initialization'!
@@ -231,13 +231,13 @@
     REGISTER OBJFUNC thecode;
     OBJ home;
 
-    if (_INST(nargs) == _MKSMALLINT(0)) {
+    if (__INST(nargs) == __MKSMALLINT(0)) {
 #if defined(THIS_CONTEXT)
 	if (__ISVALID_ILC_LNO(__pilc))
-	    _ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
+	    __ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
 #endif
 
-	thecode = _BlockInstPtr(self)->b_code;
+	thecode = __BlockInstPtr(self)->b_code;
 #ifdef NEW_BLOCK_CALL
 	if (thecode != (OBJFUNC)nil) {
 	    /* compiled machine code */
@@ -250,7 +250,7 @@
 	RETURN ( __interpret(self, 0, nil, nil COMMA_SND, nil) );
 # endif
 #else
-	home = _BlockInstPtr(self)->b_home;
+	home = __BlockInstPtr(self)->b_home;
 	if (thecode != (OBJFUNC)nil) {
 	    /* compiled machine code */
 	    RETURN ( (*thecode)(home COMMA_SND) );
@@ -276,12 +276,12 @@
     REGISTER OBJFUNC thecode;
     OBJ home;
 
-    if (_INST(nargs) == _MKSMALLINT(1)) {
+    if (__INST(nargs) == __MKSMALLINT(1)) {
 #if defined(THIS_CONTEXT)
 	if (__ISVALID_ILC_LNO(__pilc))
-	    _ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
+	    __ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
 #endif
-	thecode = _BlockInstPtr(self)->b_code;
+	thecode = __BlockInstPtr(self)->b_code;
 #ifdef NEW_BLOCK_CALL
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(self COMMA_SND, arg) );
@@ -293,7 +293,7 @@
 	RETURN ( __interpret(self, 1, nil, nil COMMA_SND, nil, arg) );
 # endif
 #else
-	home = _BlockInstPtr(self)->b_home;
+	home = __BlockInstPtr(self)->b_home;
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(home COMMA_SND, arg) );
 	}
@@ -318,12 +318,12 @@
     REGISTER OBJFUNC thecode;
     OBJ home;
 
-    if (_INST(nargs) == _MKSMALLINT(2)) {
+    if (__INST(nargs) == __MKSMALLINT(2)) {
 #if defined(THIS_CONTEXT)
 	if (__ISVALID_ILC_LNO(__pilc))
-	    _ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
+	    __ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
 #endif
-	thecode = _BlockInstPtr(self)->b_code;
+	thecode = __BlockInstPtr(self)->b_code;
 #ifdef NEW_BLOCK_CALL
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(self COMMA_SND, arg1, arg2) );
@@ -334,7 +334,7 @@
 	RETURN ( __interpret(self, 2, nil, nil COMMA_SND, nil, arg1, arg2) );
 # endif
 #else
-	home = _BlockInstPtr(self)->b_home;
+	home = __BlockInstPtr(self)->b_home;
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(home COMMA_SND, arg1, arg2) );
 	}
@@ -358,12 +358,12 @@
     REGISTER OBJFUNC thecode;
     OBJ home;
 
-    if (_INST(nargs) == _MKSMALLINT(3)) {
+    if (__INST(nargs) == __MKSMALLINT(3)) {
 #if defined(THIS_CONTEXT)
 	if (__ISVALID_ILC_LNO(__pilc))
-	    _ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
+	    __ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
 #endif
-	thecode = _BlockInstPtr(self)->b_code;
+	thecode = __BlockInstPtr(self)->b_code;
 #ifdef NEW_BLOCK_CALL
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(self COMMA_SND, arg1, arg2, arg3) );
@@ -374,7 +374,7 @@
 	RETURN ( __interpret(self, 3, nil, nil COMMA_SND, nil, arg1, arg2, arg3) );
 # endif
 #else
-	home = _BlockInstPtr(self)->b_home;
+	home = __BlockInstPtr(self)->b_home;
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(home COMMA_SND, arg1, arg2, arg3) );
 	}
@@ -398,12 +398,12 @@
     REGISTER OBJFUNC thecode;
     OBJ home;
 
-    if (_INST(nargs) == _MKSMALLINT(4)) {
+    if (__INST(nargs) == __MKSMALLINT(4)) {
 #if defined(THIS_CONTEXT)
 	if (__ISVALID_ILC_LNO(__pilc))
-	    _ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
+	    __ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
 #endif
-	thecode = _BlockInstPtr(self)->b_code;
+	thecode = __BlockInstPtr(self)->b_code;
 #ifdef NEW_BLOCK_CALL
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(self COMMA_SND, arg1, arg2, arg3, arg4) );
@@ -414,7 +414,7 @@
 	RETURN ( __interpret(self, 4, nil, nil COMMA_SND, nil, arg1, arg2, arg3, arg4) );
 # endif
 #else
-	home = _BlockInstPtr(self)->b_home;
+	home = __BlockInstPtr(self)->b_home;
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(home COMMA_SND, arg1, arg2, arg3, arg4) );
 	}
@@ -438,12 +438,12 @@
     REGISTER OBJFUNC thecode;
     OBJ home;
 
-    if (_INST(nargs) == _MKSMALLINT(5)) {
+    if (__INST(nargs) == __MKSMALLINT(5)) {
 #if defined(THIS_CONTEXT)
 	if (__ISVALID_ILC_LNO(__pilc))
-	    _ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
+	    __ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
 #endif
-	thecode = _BlockInstPtr(self)->b_code;
+	thecode = __BlockInstPtr(self)->b_code;
 #ifdef NEW_BLOCK_CALL
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(self COMMA_SND, arg1, arg2, arg3, arg4, arg5) );
@@ -454,7 +454,7 @@
 	RETURN ( __interpret(self, 5, nil, nil COMMA_SND, nil, arg1, arg2, arg3, arg4, arg5) );
 # endif
 #else
-	home = _BlockInstPtr(self)->b_home;
+	home = __BlockInstPtr(self)->b_home;
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(home COMMA_SND, arg1, arg2, arg3, arg4, arg5) );
 	}
@@ -478,12 +478,12 @@
     REGISTER OBJFUNC thecode;
     OBJ home;
 
-    if (_INST(nargs) == _MKSMALLINT(6)) {
+    if (__INST(nargs) == __MKSMALLINT(6)) {
 #if defined(THIS_CONTEXT)
 	if (__ISVALID_ILC_LNO(__pilc))
-	    _ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
+	    __ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
 #endif
-	thecode = _BlockInstPtr(self)->b_code;
+	thecode = __BlockInstPtr(self)->b_code;
 #ifdef NEW_BLOCK_CALL
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(self COMMA_SND, arg1, arg2, arg3, arg4, arg5, arg6) );
@@ -494,7 +494,7 @@
 	RETURN ( __interpret(self, 6, nil, nil COMMA_SND, nil, arg1, arg2, arg3, arg4, arg5, arg6) );
 # endif
 #else
-	home = _BlockInstPtr(self)->b_home;
+	home = __BlockInstPtr(self)->b_home;
 	if (thecode != (OBJFUNC)nil) {
 	    RETURN ( (*thecode)(home COMMA_SND, arg1, arg2, arg3, arg4, arg5, arg6) );
 	}
@@ -532,39 +532,39 @@
 
 #if defined(THIS_CONTEXT)
     if (__ISVALID_ILC_LNO(__pilc))
-	    _ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
+	    __ContextInstPtr(__thisContext)->c_lineno = __ILC_LNO_AS_OBJ(__pilc);
 #endif
-    thecode = _BlockInstPtr(self)->b_code;
+    thecode = __BlockInstPtr(self)->b_code;
 
 #ifndef NEW_BLOCK_CALL
-    home = _BlockInstPtr(self)->b_home;
+    home = __BlockInstPtr(self)->b_home;
     if (thecode != (OBJFUNC)nil) {
-        switch (nargs = _intVal(_INST(nargs))) {
+        switch (nargs = __intVal(__INST(nargs))) {
             default:
                 goto error;
             case 8:
-                ap = _ArrayInstPtr(argArray)->a_element;
+                ap = __ArrayInstPtr(argArray)->a_element;
 	        RETURN ( (*thecode)(home COMMA_SND, ap[0], ap[1], ap[2], ap[3], ap[4], ap[5], ap[6], ap[7]) );
             case 7:
-                ap = _ArrayInstPtr(argArray)->a_element;
+                ap = __ArrayInstPtr(argArray)->a_element;
 	        RETURN ( (*thecode)(home COMMA_SND, ap[0], ap[1], ap[2], ap[3], ap[4], ap[5], ap[6]) );
             case 6:
-                ap = _ArrayInstPtr(argArray)->a_element;
+                ap = __ArrayInstPtr(argArray)->a_element;
 	        RETURN ( (*thecode)(home COMMA_SND, ap[0], ap[1], ap[2], ap[3], ap[4], ap[5]) );
             case 5:
-                ap = _ArrayInstPtr(argArray)->a_element;
+                ap = __ArrayInstPtr(argArray)->a_element;
 	        RETURN ( (*thecode)(home COMMA_SND, ap[0], ap[1], ap[2], ap[3], ap[4]) );
             case 4:
-                ap = _ArrayInstPtr(argArray)->a_element;
+                ap = __ArrayInstPtr(argArray)->a_element;
 	        RETURN ( (*thecode)(home COMMA_SND, ap[0], ap[1], ap[2], ap[3]) );
             case 3:
-                ap = _ArrayInstPtr(argArray)->a_element;
+                ap = __ArrayInstPtr(argArray)->a_element;
 	        RETURN ( (*thecode)(home COMMA_SND, ap[0], ap[1], ap[2]) );
             case 2:
-                ap = _ArrayInstPtr(argArray)->a_element;
+                ap = __ArrayInstPtr(argArray)->a_element;
 	        RETURN ( (*thecode)(home COMMA_SND, ap[0], ap[1]) );
             case 1:
-	        RETURN ( (*thecode)(home COMMA_SND, _ArrayInstPtr(argArray)->a_element[0]) );
+	        RETURN ( (*thecode)(home COMMA_SND, __ArrayInstPtr(argArray)->a_element[0]) );
             case 0:
 	        RETURN ( (*thecode)(home COMMA_SND) );
                 break;
@@ -572,28 +572,29 @@
     }
 #endif
 
-    switch (nargs = _intVal(_INST(nargs))) {
+    switch (nargs = __intVal(__INST(nargs))) {
 	default:
 	    goto error;
 	case 8:
-	    a8 = _ArrayInstPtr(argArray)->a_element[7];
+	    a8 = __ArrayInstPtr(argArray)->a_element[7];
 	case 7:
-	    a7 = _ArrayInstPtr(argArray)->a_element[6];
+	    a7 = __ArrayInstPtr(argArray)->a_element[6];
 	case 6:
-	    a6 = _ArrayInstPtr(argArray)->a_element[5];
+	    a6 = __ArrayInstPtr(argArray)->a_element[5];
 	case 5:
-	    a5 = _ArrayInstPtr(argArray)->a_element[4];
+	    a5 = __ArrayInstPtr(argArray)->a_element[4];
 	case 4:
-	    a4 = _ArrayInstPtr(argArray)->a_element[3];
+	    a4 = __ArrayInstPtr(argArray)->a_element[3];
 	case 3:
-	    a3 = _ArrayInstPtr(argArray)->a_element[2];
+	    a3 = __ArrayInstPtr(argArray)->a_element[2];
 	case 2:
-	    a2 = _ArrayInstPtr(argArray)->a_element[1];
+	    a2 = __ArrayInstPtr(argArray)->a_element[1];
 	case 1:
-	    a1 = _ArrayInstPtr(argArray)->a_element[0];
+	    a1 = __ArrayInstPtr(argArray)->a_element[0];
 	case 0:
 	    break;
     }
+
 #ifdef NEW_BLOCK_CALL
     if (thecode != (OBJFUNC)nil) {
 	RETURN ( (*thecode)(self COMMA_SND, a1, a2, a3, a4, a5, a6, a7, a8) );