Changeset 15401

Timestamp:

10/10/20 21:43:38 (3 years ago)

Author:

Mark Evenson

Message:

Use PathnameURL namespace for URL things

Remove Pathname.jarSeparator in favor of PathnameURL.JAR_URI_SUFFIX.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Pathname.java (modified) (4 diffs)
• PathnameJar.java (modified) (2 diffs)
• PathnameURL.java (modified) (1 diff)

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

@@ -261 +261 @@
     }
 
-    static final Symbol SCHEME = internKeyword("SCHEME");
-    static final Symbol AUTHORITY = internKeyword("AUTHORITY");
-    static final Symbol QUERY = internKeyword("QUERY");
-    static final Symbol FRAGMENT = internKeyword("FRAGMENT");
-
-    static final private String jarSeparator = "!/";
-
   private static final Pathname init(String s) { 
       Pathname result = new Pathname();
@@ -316 +309 @@
         
         // A JAR file
-        if (s.startsWith("jar:") && s.endsWith(jarSeparator)) {
+        if (s.startsWith(PathnameJar.JAR_URI_PREFIX)
+            && s.endsWith(PathnameJar.JAR_URI_SUFFIX)) {
           return (PathnameJar)PathnameJar.create(s);
         }
 
         // An entry in a JAR file
-        final int separatorIndex = s.lastIndexOf(jarSeparator);
-        if (separatorIndex > 0 && s.startsWith("jar:")) {
+        final int separatorIndex = s.lastIndexOf(PathnameJar.JAR_URI_SUFFIX);
+        if (separatorIndex > 0 && s.startsWith(PathnameJar.JAR_URI_PREFIX)) {
           return (PathnameJar)PathnameJar.create(s);
         }
@@ -504 +498 @@
                              || isURL());
             if (isURL()) {
-                LispObject scheme = Symbol.GETF.execute(getHost(), SCHEME, NIL);
-                LispObject authority = Symbol.GETF.execute(getHost(), AUTHORITY, NIL);
+                LispObject scheme = Symbol.GETF.execute(getHost(), PathnameURL.SCHEME, NIL);
+                LispObject authority = Symbol.GETF.execute(getHost(), PathnameURL.AUTHORITY, NIL);
                 Debug.assertTrue(scheme != NIL);
                 sb.append(scheme.getStringValue());
@@ -2165 +2159 @@
     if (this instanceof PathnameURL) {
       PathnameURL p = (PathnameURL) this;
-      LispObject scheme = Symbol.GETF.execute(p.getHost(), SCHEME, NIL);
+      LispObject scheme = Symbol.GETF.execute(p.getHost(), PathnameURL.SCHEME, NIL);
       if (scheme.equals(NIL)
           || p.getHost().getStringValue().equals("file")) {

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

@@ -78 +78 @@
 
   static public LispObject createFromFile(String s) {
-    return PathnameJar.create("jar:file:" + s + JAR_URI_SUFFIX);
+    return PathnameJar.create(JAR_URI_PREFIX + "file:" + s + JAR_URI_SUFFIX);
   }
 
   static public LispObject createEntryFromFile(String jar, String entry) {
-    return PathnameJar.create("jar:file:" + jar + JAR_URI_SUFFIX + entry);
+    return PathnameJar.create(JAR_URI_PREFIX + "file:" + jar + JAR_URI_SUFFIX + entry);
   }
 
@@ -99 +99 @@
     int i = s.lastIndexOf(JAR_URI_PREFIX);
     if (i == -1) {
-      parse_error("Failed to find any occurence of 'jar:' prefixes:" + s);
+      parse_error("Failed to find any occurence of '" + JAR_URI_PREFIX + "' prefixes:" + s);
       return null; // not reached
     }

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

@@ -75 +75 @@
       parse_error("Cannot form a PATHNAME-URL from " + s);
     }
-    if (s.startsWith("jar:")) {
+    if (s.startsWith(PathnameJar.JAR_URI_PREFIX)) {
       return PathnameJar.create(s);
     }