Changeset 12490

Timestamp:

02/20/10 20:36:40 (13 years ago)

Author:

vvoutilainen

Message:

More cleanups, introduce a function for adjusting return values
when a function is implemented in terms of another.

File:

• trunk/abcl/src/org/armedbear/lisp/StringFunctions.java (modified) (5 diffs)

trunk/abcl/src/org/armedbear/lisp/StringFunctions.java

@@ -256 +256 @@
     };
 
+    private static LispObject 
+        swapReturnValue(int original,
+                        StringIndicesAndChars indicesAndChars) {
+        if (original < 0) {
+            return NIL;
+        }
+        int delta = original - indicesAndChars.start1;
+        int retVal = indicesAndChars.start2 + delta;
+        return Fixnum.getInstance(retVal);
+    }
+
     // ### %string>
     // Case sensitive.
@@ -274 +285 @@
                                       third, fourth);
             int tmp = lessThan(indicesAndChars);
-            if (tmp < 0) {
-                return NIL;
-            }
-            int delta = tmp - indicesAndChars.start1;
-            int retVal = indicesAndChars.start2 + delta;
-            return Fixnum.getInstance(retVal);
+            return swapReturnValue(tmp, indicesAndChars);
         }
     };
@@ -347 +353 @@
                                       third, fourth);
             int tmp = lessThanOrEqual(indicesAndChars);
-            if (tmp < 0) {
-                return NIL;
-            }
-            int delta = tmp - indicesAndChars.start1;
-            int retVal = indicesAndChars.start2 + delta;
-            return Fixnum.getInstance(retVal);
+            return swapReturnValue(tmp, indicesAndChars);
         }
     };
@@ -421 +422 @@
                                       third, fourth);
             int tmp = stringLessp(indicesAndChars);
-            if (tmp < 0) {
-                return NIL;
-            }
-            int delta = tmp - indicesAndChars.start1;
-            int retVal = indicesAndChars.start2 + delta;
-            return Fixnum.getInstance(retVal);
+            return swapReturnValue(tmp, indicesAndChars);
         }
     };
@@ -496 +492 @@
                                       third, fourth);
             int tmp = stringNotLessp(indicesAndChars);
-            if (tmp < 0) {
-                return NIL;
-            }
-            int delta = tmp - indicesAndChars.start1;
-            int retVal = indicesAndChars.start2 + delta;
-            return Fixnum.getInstance(retVal);
+            return swapReturnValue(tmp, indicesAndChars);
         }
     };