Changeset 15414

Timestamp:

10/14/20 07:07:24 (3 years ago)

Author:

Mark Evenson

Message:

pathname: change parsing of type

Change the algorithim for determining type from parsing strings to be
more in line with SBCL/CCL:

| Expression | NAME | TYPE |

+--------+------|

| #p"..." | ".." | "" |
| #p".foo" | ".foo" | NIL |

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (1 diff)

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

@@ -392 +392 @@
     }
 
-    if (s.startsWith(".") 
-        // No TYPE can be parsed
-        && (s.indexOf(".", 1) == -1 
-            || s.substring(s.length() -1).equals("."))) {
-      result.setName(new SimpleString(s));
-      return result;
-    }
-
     int index = s.lastIndexOf('.');
-    String n = null;
-    String t = null;
+    String name = null;
+    String type = null;
     if (index > 0) {
-      n = s.substring(0, index);
-      t = s.substring(index + 1);
+      name = s.substring(0, index);
+      type = s.substring(index + 1);
     } else if (s.length() > 0) {
-      n = s;
-    }
-    if (n != null) {
-      if (n.equals("*")) {
+      name = s;
+    }
+    if (name != null) {
+      if (name.equals("*")) {
         result.setName(Keyword.WILD);
       } else {
-        result.setName(new SimpleString(n));
-      }
-        }
-    if (t != null) {
-      if (t.equals("*")) {
+        result.setName(new SimpleString(name));
+      }
+    }
+    if (type != null) {
+      if (type.equals("*")) {
         result.setType(Keyword.WILD);
       } else {
-        result.setType(new SimpleString(t));
+        result.setType(new SimpleString(type));
       }
     }