Changeset 15028

Timestamp:

06/01/17 06:45:39 (6 years ago)

Author:

Mark Evenson

Message:

More Java versions (1.8, 1.9)

(Olof-Joachim Frahm)

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Keyword.java (modified) (1 diff)
• Lisp.java (modified) (1 diff)

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

@@ -98 +98 @@
         JAVA_1_6            = internKeyword("JAVA-1.6"),
         JAVA_1_7            = internKeyword("JAVA-1.7"),
+        JAVA_1_8            = internKeyword("JAVA-1.8"),
+        JAVA_1_9            = internKeyword("JAVA-1.9"),
         KEY                 = internKeyword("KEY"),
         KEY_AND_VALUE       = internKeyword("KEY-AND-VALUE"),

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

@@ -2406 +2406 @@
     } 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