Changeset 4268

Timestamp:

10/09/03 17:35:31 (19 years ago)

Author:

piso

Message:

%STRING-LESSP

File:

• trunk/j/src/org/armedbear/lisp/StringFunctions.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: StringFunctions.java,v 1.7 2003-09-28 16:25:07 piso Exp $
+ * $Id: StringFunctions.java,v 1.8 2003-10-09 17:35:31 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -272 +272 @@
             int start2 = Fixnum.getInt(args[4]);
             int end2 = Fixnum.getInt(args[5]);
-            int i, j;
-            for (i = start1, j = start2; i < end1 && j < end2; i++, j++) {
+            int i = start1;
+            int j = start2;
+            while (true) {
+                if (i == end1) {
+                    // Reached end of string1.
+                    if (j == end2)
+                        return NIL; // Strings are identical.
+                    return new Fixnum(i);
+                }
+                if (j == end2) {
+                    // Reached end of string2.
+                    return NIL;
+                }
                 char c1 = Utilities.toUpperCase(array1[i]);
                 char c2 = Utilities.toUpperCase(array2[j]);
-                if (c1 == c2)
-                    continue;
-                if (c1 > c2)
-                    return NIL;
-                if (c1 < c2)
-                    return new Fixnum(i);
-            }
-            // Strings are equal.
-            return NIL;
+                if (c1 == c2) {
+                    ++i;
+                    ++j;
+                    continue;
+                }
+                if (c1 > c2)
+                    return NIL;
+                if (c1 < c2)
+                    return new Fixnum(i);
+            }
         }
     };