--- a/String.st	Sun Apr 25 14:40:20 1999 +0200
+++ b/String.st	Mon Apr 26 09:58:31 1999 +0200
@@ -340,10 +340,9 @@
     REGISTER OBJ slf, cls;
 
     if (__isSmallInteger(index)) {
+	slf = self;
+	cls = __qClass(slf);
 	indx = __intVal(index) - 1;
-	slf = self;
-
-	cls = __qClass(slf);
 	if (cls != String)
 	    indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
 	if ((unsigned)indx < (unsigned)(__stringSize(slf))) {
@@ -422,10 +421,9 @@
     REGISTER OBJ slf, cls;
 
     if (__isSmallInteger(index)) {
-	indx = __intVal(index) - 1;
-
 	slf = self;
 	cls = __qClass(slf);
+	indx = __intVal(index) - 1;
 	if (cls != String)
 	    indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
 	if ((unsigned)indx < (unsigned)(__stringSize(slf))) {
@@ -456,8 +454,8 @@
 	value = __intVal(_characterVal(aCharacter));
 	if (((unsigned)value <= 0xFF)
 	 && __isSmallInteger(index)) {
+	    cls = __qClass(slf);
 	    indx = __intVal(index) - 1;
-	    cls = __qClass(slf);
 	    if (cls != String)
 		indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
 	    if ((unsigned)indx < (unsigned)(__stringSize(slf))) {
@@ -2972,5 +2970,5 @@
 !String class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.134 1999-04-24 19:23:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.135 1999-04-26 07:58:31 cg Exp $'
 ! !