Changeset 15357

Timestamp:

07/30/20 14:09:10 (3 years ago)

Author:

Mark Evenson

Message:

Re-work strategy for CL:*FEATURES* for hosting JVM

Add a keyword denoting the Java platform to CL:*FEATURES* of the form
"JAVA-<n>" where "<n>" is an integer denoting the major version of the
platform according to JEP-223.

We deprecate depending on the presence of JAVA-1.6, JAVA-1.7, and
JAVA-1.8 in favor of JAVA-6, JAVA-7, and JAVA-8.

Add the contents of the "os.arch" property if not running under x86.

c.f. <​https://openjdk.java.net/jeps/223>

TODO: describe the presence of of various CL:*FEATURES* in the Manual.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Keyword.java (modified) (2 diffs)
• Lisp.java (modified) (4 diffs)

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

@@ -94 +94 @@
         IO                  = internKeyword("IO"),
         J                   = internKeyword("J"),
+    // BEGIN deprecated:  use "JAVA-<n>" instead
         JAVA_1_4            = internKeyword("JAVA-1.4"),
         JAVA_1_5            = internKeyword("JAVA-1.5"),
@@ -100 +101 @@
         JAVA_1_8            = internKeyword("JAVA-1.8"),
         JAVA_1_9            = internKeyword("JAVA-1.9"),
+    // END deprecated 
         KEY                 = internKeyword("KEY"),
         KEY_AND_VALUE       = internKeyword("KEY-AND-VALUE"),

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

@@ -2367 +2367 @@
     Symbol.READ_EVAL.initializeSpecial(T);
   }
-
+  
+
+  //
   // ### *features*
+  //
   static
   {
@@ -2374 +2377 @@
     final String javaVersion = System.getProperty("java.version");
     final String osArch = System.getProperty("os.arch");
-
+    
     // Common features
     LispObject featureList = list(Keyword.ARMEDBEAR, Keyword.ABCL,
                                   Keyword.COMMON_LISP, Keyword.ANSI_CL,
-                                  Keyword.CDR6, Keyword.MOP,
+                                  Keyword.CDR6, 
+                                  Keyword.MOP,
                                   internKeyword("PACKAGE-LOCAL-NICKNAMES"));
+    
+    // add the contents of version as a keyword symbol regardless of runtime value
+    featureList = featureList.push(internKeyword("JVM-" + javaVersion));
+    {
+      String platformVersion = null;
+      if (javaVersion.startsWith("1.")) {
+          // pre <https://openjdk.java.net/jeps/223>
+          int i = javaVersion.indexOf(".", 2);
+          platformVersion = javaVersion.substring(2, i);
+        } else {
+          int i = javaVersion.indexOf(".");
+          platformVersion = javaVersion.substring(0, i);
+      }
+      featureList = featureList.push(internKeyword("JAVA-" + platformVersion));
+    }
+
+    {       // Deprecated java version
+      if (javaVersion.startsWith("1.5")) {
+        featureList = new Cons(Keyword.JAVA_1_5, featureList);
+      } else if (javaVersion.startsWith("1.6")) {
+        featureList = new Cons(Keyword.JAVA_1_6, featureList);
+      } else if (javaVersion.startsWith("1.7")) {
+        featureList = new Cons(Keyword.JAVA_1_7, featureList);
+      } else if (javaVersion.startsWith("1.8")) {
+        featureList = new Cons(Keyword.JAVA_1_8, featureList);
+      }
+    }
+
+    
     // OS type
     if (osName.startsWith("Linux"))
       featureList = Primitives.APPEND.execute(list(Keyword.UNIX,
                                                   Keyword.LINUX),
-                                             featureList);
+                                              featureList);
     else if (osName.startsWith("SunOS"))
       featureList = Primitives.APPEND.execute(list(Keyword.UNIX,
@@ -2390 +2423 @@
                                                    Keyword.SOLARIS),
                                               featureList);
-    else if (osName.startsWith("Mac OS X") ||
-             osName.startsWith("Darwin"))
+    else if (osName.startsWith("Mac OS X")
+             || osName.startsWith("Darwin"))
       featureList = Primitives.APPEND.execute(list(Keyword.UNIX,
                                                    Keyword.DARWIN),
@@ -2409 +2442 @@
     else if (osName.startsWith("Windows"))
       featureList = new Cons(Keyword.WINDOWS, featureList);
-    // Java version
-    if (javaVersion.startsWith("1.5")) {
-        featureList = new Cons(Keyword.JAVA_1_5, featureList);
-    } else if (javaVersion.startsWith("1.6")) {
-        featureList = new Cons(Keyword.JAVA_1_6, featureList);
-    } else if (javaVersion.startsWith("1.7")) {
-        featureList = new Cons(Keyword.JAVA_1_7, featureList);
-    } else if (javaVersion.startsWith("1.8")) {
-        featureList = new Cons(Keyword.JAVA_1_8, featureList);
-    } else if (javaVersion.startsWith("1.9")) {
-        featureList = new Cons(Keyword.JAVA_1_9, featureList);
-    }
+
     // Processor architecture
-    if(osArch != null) {
-      if (osArch.equals("amd64") || osArch.equals("x86_64"))
-        featureList = new Cons(Keyword.X86_64, featureList);
-      else if (osArch.equals("x86") || osArch.equals("i386"))
-        featureList = new Cons(Keyword.X86, featureList);
+    if (osArch != null) {
+      if (osArch.equals("amd64") || osArch.equals("x86_64")) {
+        featureList = featureList.push(Keyword.X86_64);
+      } else if (osArch.equals("x86") || osArch.equals("i386")) {
+        featureList = featureList.push(Keyword.X86);
+      } else {
+        // just push the value of 'os.arch' as a keyword
+        featureList = featureList.push(internKeyword(osArch));
+      }
     }
     Symbol.FEATURES.initializeSpecial(featureList);