--- a/LargeInteger.st	Tue Apr 02 18:30:51 1996 +0200
+++ b/LargeInteger.st	Wed Apr 03 00:06:56 1996 +0200
@@ -736,13 +736,13 @@
 %{  /* NOCONTEXT */
     OBJ t;
 
-    if (_INST(sign) == _MKSMALLINT(0)) {
-	RETURN (_MKSMALLINT(0));
+    if (__INST(sign) == __MKSMALLINT(0)) {
+	RETURN (__MKSMALLINT(0));
     }
 
-    t = _INST(digitByteArray);
+    t = __INST(digitByteArray);
     if (__isByteArray(t)) {
-	unsigned char *_digitBytes = _ByteArrayInstPtr(t)->ba_element;
+	unsigned char *_digitBytes = __ByteArrayInstPtr(t)->ba_element;
 	int _idx = _byteArraySize(t);
 	int _val;
 
@@ -751,35 +751,35 @@
 	}
 	switch (_idx) {
 	    case 0:
-		RETURN (_MKSMALLINT(0));
+		RETURN (__MKSMALLINT(0));
 		break;
 
 	    case 1:
 		_val = _digitBytes[0];
-		if (_INST(sign) == _MKSMALLINT(-1))
+		if (__INST(sign) == __MKSMALLINT(-1))
 		    _val = -_val;
-		RETURN (_MKSMALLINT(_val));
+		RETURN (__MKSMALLINT(_val));
                 
 	    case 2:
 		_val = (_digitBytes[1]<<8) + _digitBytes[0];
-		if (_INST(sign) == _MKSMALLINT(-1))
+		if (__INST(sign) == __MKSMALLINT(-1))
 		    _val = -_val;
-		RETURN (_MKSMALLINT(_val));
+		RETURN (__MKSMALLINT(_val));
 
 	    case 3:
 		_val = (((_digitBytes[2]<<8) + _digitBytes[1])<<8) + _digitBytes[0];
-		if (_INST(sign) == _MKSMALLINT(-1))
+		if (__INST(sign) == __MKSMALLINT(-1))
 		    _val = -_val;
-		RETURN (_MKSMALLINT(_val));
+		RETURN (__MKSMALLINT(_val));
 
 	    case 4:
 		_val = _digitBytes[3];
 		if (_val <= 0x40) {
 		    _val = (((((_val<<8) + _digitBytes[2])<<8) + _digitBytes[1])<<8) + _digitBytes[0];
-		    if (_INST(sign) == _MKSMALLINT(-1))
+		    if (__INST(sign) == __MKSMALLINT(-1))
 			_val = -_val;
 		    if ((_val >= _MIN_INT) && (_val <= _MAX_INT)) {
-			RETURN (_MKSMALLINT(_val));
+			RETURN (__MKSMALLINT(_val));
 		    }
 		}
 		break;
@@ -1000,14 +1000,14 @@
     ok := false.
 %{
     if (__bothSmallInteger(len, val)
-     && __isByteArray(_INST(digitByteArray))
+     && __isByteArray(__INST(digitByteArray))
      && __isByteArray(resultDigitByteArray)) {
-	int _l = _intVal(len);
-	int _v = _intVal(val);
+	int _l = __intVal(len);
+	int _v = __intVal(val);
 	unsigned _carry = 0;
 	unsigned _prod;
-	unsigned char *digitP = _ByteArrayInstPtr(_INST(digitByteArray))->ba_element;
-	unsigned char *resultP = _ByteArrayInstPtr(resultDigitByteArray)->ba_element;
+	unsigned char *digitP = __ByteArrayInstPtr(__INST(digitByteArray))->ba_element;
+	unsigned char *resultP = __ByteArrayInstPtr(resultDigitByteArray)->ba_element;
 
 	while (_l-- > 0) {
 	    _prod = *digitP++ * _v + _carry;
@@ -1189,14 +1189,14 @@
     newDigitByteArray := result digits.
     ok := false.
 %{
-    if (__isByteArray(_INST(digitByteArray))
+    if (__isByteArray(__INST(digitByteArray))
      && __isByteArray(newDigitByteArray)
      && __bothSmallInteger(count, aSmallInteger)) {
 	unsigned int rest = 0;
-	int index = _intVal(count);
-	int divisor = _intVal(aSmallInteger);
-	unsigned char *digitBytes = _ByteArrayInstPtr(_INST(digitByteArray))->ba_element;
-	unsigned char *resultBytes = _ByteArrayInstPtr(newDigitByteArray)->ba_element;
+	int index = __intVal(count);
+	int divisor = __intVal(aSmallInteger);
+	unsigned char *digitBytes = __ByteArrayInstPtr(__INST(digitByteArray))->ba_element;
+	unsigned char *resultBytes = __ByteArrayInstPtr(newDigitByteArray)->ba_element;
 
 	while (index > 0) {
 	    unsigned int t;
@@ -1207,7 +1207,7 @@
 	    resultBytes[index] = t / divisor;
 	    rest = t % divisor;
 	}
-	prevRest = _MKSMALLINT(rest);
+	prevRest = __MKSMALLINT(rest);
 	ok = true;
     }
 %}.
@@ -1432,18 +1432,18 @@
     resultDigitByteArray := result digits.
     ok := false.
 %{
-    if (__isByteArray(_INST(digitByteArray))
+    if (__isByteArray(__INST(digitByteArray))
      && __isByteArray(otherDigitByteArray)
      && __isByteArray(resultDigitByteArray)
      && __bothSmallInteger(len1, len2)) {
-	unsigned char *myBytes = _ByteArrayInstPtr(_INST(digitByteArray))->ba_element;
-	unsigned char *otherBytes = _ByteArrayInstPtr(otherDigitByteArray)->ba_element;
-	unsigned char *resultBytes = _ByteArrayInstPtr(resultDigitByteArray)->ba_element;
+	unsigned char *myBytes = __ByteArrayInstPtr(__INST(digitByteArray))->ba_element;
+	unsigned char *otherBytes = __ByteArrayInstPtr(otherDigitByteArray)->ba_element;
+	unsigned char *resultBytes = __ByteArrayInstPtr(resultDigitByteArray)->ba_element;
 	int _index1, _index2, _dstIndex, _idx;
 	unsigned _prod, _carry, _v;
 
-	for (_index1 = 0; _index1 < _intVal(len1); _index1++) {
-	    for (_index2 = 0; _index2 < _intVal(len2); _index2++) {
+	for (_index1 = 0; _index1 < __intVal(len1); _index1++) {
+	    for (_index2 = 0; _index2 < __intVal(len2); _index2++) {
 		_dstIndex = _index1 + _index2;
 		_prod = myBytes[_index1] * otherBytes[_index2];
 		_prod += resultBytes[_dstIndex];
@@ -1609,5 +1609,5 @@
 !LargeInteger class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/LargeInteger.st,v 1.23 1996-03-05 11:29:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/LargeInteger.st,v 1.24 1996-04-02 22:02:08 cg Exp $'
 ! !