Changeset 15497

Timestamp:

12/21/20 21:28:31 (2 years ago)

Author:

Mark Evenson

Message:

Enusure that *FEATURES* contains an integer :JAVA-<n> value

With Project Loom, *FEATURES* contains :JAVA-16 :|JVM-16-loom|.

File:

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

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

@@ -2430 +2430 @@
           }
       }
+      // We wish to declare an integer Java version, but
+      // specialized builds can prefix further information in the
+      // java.version property
+      try {
+  Integer.parseInt(javaVersion);
+      } catch (NumberFormatException e) {
+  for (int i = 0; i < javaVersion.length(); i++) {
+    char c = javaVersion.charAt(i); // Unicode?
+    if (!Character.isDigit(c)) {
+      // Push the non-conforming keyword for completeness
+      featureList.push(internKeyword("JAVA-" + javaVersion));
+      platformVersion = javaVersion.substring(0, i);
+      break;
+    }
+  }
+      }
       featureList = featureList.push(internKeyword("JAVA-" + platformVersion));
     }