--- a/SmallInteger.st	Mon Apr 20 00:31:45 2015 +0200
+++ b/SmallInteger.st	Mon Apr 20 00:55:08 2015 +0200
@@ -214,7 +214,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.times( context.stArg(0) ));
+    return context._RETURN( self.times( aNumber ));
 #else
     /*
      * notice:
@@ -417,7 +417,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.plus( context.stArg(0) ));
+    return context._RETURN( self.plus( aNumber ));
 #else
     /*
      * notice:
@@ -466,7 +466,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.minus( context.stArg(0) ));
+    return context._RETURN( self.minus( aNumber ));
 #else
     /*
      * notice:
@@ -515,7 +515,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.quotient( context.stArg(0) ));
+    return context._RETURN( self.quotient( aNumber ));
 #else
 
     /*
@@ -604,7 +604,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.quotientTruncated( context.stArg(0) ));
+    return context._RETURN( self.quotientTruncated( aNumber ));
 #else
     /*
      * notice:
@@ -718,7 +718,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.remainder( context.stArg(0) ));
+    return context._RETURN( self.remainder( aNumber ));
 #else
     /*
      * notice:
@@ -834,7 +834,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.quotient(context.stArg(0)));
+    return context._RETURN( self.quotient(aNumber));
 #else
     INT val;
 
@@ -882,7 +882,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.bitAnd(context.stArg(0)));
+    return context._RETURN( self.bitAnd(anInteger));
 #else
     /* anding the tags doesn't change it */
     if (__isSmallInteger(anInteger)) {
@@ -906,7 +906,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.bitAt(context.stArg(0)));
+    return context._RETURN( self.bitAt(anIntegerIndex));
 #else
     if (__isSmallInteger(anIntegerIndex)) {
 	INT idx = __smallIntegerVal(anIntegerIndex);
@@ -959,7 +959,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.bitClear(context.stArg(0)));
+    return context._RETURN( self.bitClear(anInteger));
 #else
     /* anding the tags doesn't change it */
     if (__isSmallInteger(anInteger)) {
@@ -1084,7 +1084,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.bitOr( context.stArg(0) ));
+    return context._RETURN( self.bitOr( anInteger ));
 #else
     /* oring the tags doesn't change it */
     if (__isSmallInteger(anInteger)) {
@@ -1112,7 +1112,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.bitShift( context.stArg(0) ));
+    return context._RETURN( self.bitShift( shiftCount ));
 #else
     INT bits, count;
 
@@ -1191,7 +1191,7 @@
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
     return context._RETURN(
-	    ( self.bitAnd( context.stArg(0) ) == STInteger._0 )
+	    ( self.bitAnd( aMask ) == STInteger._0 )
 	    ? STObject.False : STObject.True );
     /* NOTREACHED */
 #else
@@ -1222,7 +1222,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.bitXor( context.stArg(0) ));
+    return context._RETURN( self.bitXor( anInteger ));
 #else
     /* xoring the tags turns it off - or it in again */
     if (__isSmallInteger(anInteger)) {
@@ -1847,7 +1847,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    int idx = context.stArg(0).intValue() - 1;
+    int idx = index.intValue() - 1;
 
     if (idx <= 7) {
 	int byteVal = (int)((self.longValue() >> (idx * 8)) & 0xFF);
@@ -2514,7 +2514,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.ltP( context.stArg(0) ));
+    return context._RETURN( self.ltP( aNumber ));
 #else
     if (__isSmallInteger(aNumber)) {
 # ifdef POSITIVE_ADDRESSES
@@ -2538,7 +2538,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.leP( context.stArg(0) ));
+    return context._RETURN( self.leP( aNumber ));
 #else
 
     if (__isSmallInteger(aNumber)) {
@@ -2565,7 +2565,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.eqP( context.stArg(0) ));
+    return context._RETURN( self.eqP( aNumber ));
 #else
 
     if (aNumber == self) {
@@ -2592,7 +2592,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.gtP( context.stArg(0) ));
+    return context._RETURN( self.gtP( aNumber ));
 #else
 
     if (__isSmallInteger(aNumber)) {
@@ -2618,7 +2618,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.geP( context.stArg(0) ));
+    return context._RETURN( self.geP( aNumber ));
 #else
 
     if (__isSmallInteger(aNumber)) {
@@ -2741,7 +2741,10 @@
     "return true, if the arguments value is not equal to mine"
 
 %{  /* NOCONTEXT */
-#ifndef __JAVA__
+#ifdef __JAVA__
+    return context._RETURN( (self.eqP( aNumber ) == STObject.True) ? STObject.False : STObject.True);
+    /* NOTREACHED */
+#else
 
     if (aNumber == self) {
 	RETURN ( false );
@@ -4636,8 +4639,10 @@
      reimplemented here for speed"
 
 %{  /* NOCONTEXT */
-#ifndef __JAVA__
-
+#ifdef __JAVA__
+    return context._RETURN( self.ltP(0) );
+    /* NOTREACHED */
+#else
 # if TAG_INT == 1
     /* tag bit does not change sign */
     RETURN ( ((INT)(self) < 0) ? true : false );
@@ -4744,7 +4749,9 @@
      reimplemented here for speed"
 
 %{  /* NOCONTEXT */
-#ifndef __JAVA__
+#ifdef __JAVA__
+    return context._RETURN( (self.ltP(0) == STObject.True) ? STObject.False : STObject.True);
+#else
 
 # if TAG_INT == 1
     /* tag bit does not change sign */
@@ -4806,11 +4813,11 @@
 !SmallInteger class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.230 2015-04-19 22:31:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.231 2015-04-19 22:55:08 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.230 2015-04-19 22:31:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.231 2015-04-19 22:55:08 cg Exp $'
 ! !
 
 

--- a/String.st	Mon Apr 20 00:31:45 2015 +0200
+++ b/String.st	Mon Apr 20 00:55:08 2015 +0200
@@ -161,7 +161,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.basicNew( context.stArg(0).intValue() ));
+    return context._RETURN( self.basicNew( anInteger.intValue() ));
 #else
     OBJ newString;
     REGISTER int len;
@@ -353,7 +353,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.basicNew( context.stArg(0).intValue() ));
+    return context._RETURN( self.basicNew( anInteger.intValue() ));
 #else
     OBJ newString;
     REGISTER int len;
@@ -560,7 +560,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    if (context.stArg(0).isSmallInteger()) {
+    if (index.isSmallInteger()) {
 	int idx1Based = context.stArg(0).intValue();   // st index is 1 based
 	return context.RETURN( self.basicAt( idx1Based ));
     }
@@ -595,12 +595,11 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    if (context.stArg(0).isSmallInteger()) {
-	int idx1Based = context.stArg(0).intValue();   // st index is 1 based
-	STObject val = context.stArg(1);
-
-	self.basicAt_put_(idx1Based, val );
-	return context.RETURN( val );
+    if (index.isSmallInteger()) {
+	int idx1Based = index.intValue();   // st index is 1 based
+
+	self.basicAt_put_(idx1Based, aCharacter );
+	return context.RETURN( aCharacter );
     }
 #else
     REGISTER int value, indx;
@@ -632,8 +631,8 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    if (context.stArg(0).isSmallInteger()) {
-	int idx1Based = context.stArg(0).intValue();   // st index is 1 based
+    if (index.isSmallInteger()) {
+	int idx1Based = index.intValue();   // st index is 1 based
 	return context.RETURN( self.basicAt( idx1Based ));
     }
 #else
@@ -671,12 +670,11 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    if (context.stArg(0).isSmallInteger()) {
-	int idx1Based = context.stArg(0).intValue();   // st index is 1 based
-	STObject val = context.stArg(1);
-
-	self.basicAt_put_(idx1Based, val );
-	return context.RETURN( val );
+    if (index.isSmallInteger()) {
+	int idx1Based = index.intValue();   // st index is 1 based
+
+	self.basicAt_put_(idx1Based, aCharacter );
+	return context.RETURN( aCharacter );
     }
 #else
     REGISTER int value, indx;
@@ -1441,7 +1439,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.stringLtP( context.stArg(0) ) );
+    return context._RETURN( self.stringLtP(aString) );
     /* NOTREACHED */
 #else
     int len1, len2, cmp;
@@ -1502,7 +1500,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.stringEqualP( context.stArg(0) ) );
+    return context._RETURN( self.stringEqualP(aString) );
     /* NOTREACHED */
 #else
     int l1, l2;
@@ -1625,7 +1623,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( context.stArg(0).stringLtP( self ) );
+    return context._RETURN( aString.stringLtP( self ) );
     /* NOTREACHED */
 #else
     int len1, len2, cmp;
@@ -2028,7 +2026,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __JAVA__
-    return context._RETURN( self.stringEqualP( context.stArg(0).not()) );
+    return context._RETURN( self.stringEqualP( aString.not()) );
     /* NOTREACHED */
 #else
     int l1, l2;
@@ -4255,9 +4253,9 @@
 !String class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.333 2015-04-19 22:30:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.334 2015-04-19 22:55:08 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.333 2015-04-19 22:30:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.334 2015-04-19 22:55:08 cg Exp $'
 ! !