Changeset 14215 for trunk/abcl/src/org

Timestamp:

10/24/12 18:49:47 (8 years ago)

Author:

Mark Evenson

Message:

LISP-IMPLEMENTATION-VERSION returns executing JVM as second value.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Primitives.java (modified) (1 diff)
• lisp_implementation_version.java (modified) (2 diffs)

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

@@ -408 +408 @@
 
     // ### values
-    private static final Primitive VALUES = new pf_values();
+    public static final Primitive VALUES = new pf_values();
     private static final class pf_values extends Primitive {
         pf_values() {

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

@@ -35 +35 @@
 
 import java.math.BigInteger;
+import java.text.MessageFormat;
 
 // ### lisp_implementation_version
@@ -48 +49 @@
     public LispObject execute()
     {
-        return new SimpleString(Version.getVersion());
+        String vendor = System.getProperty("java.vendor");
+        vendor = vendor.replace(" ", "_");
+        String jdkVersion = MessageFormat.format("{0}-{1}-{2})",
+                                          vendor,
+                                          System.getProperty("os.arch"),
+                                          System.getProperty("java.runtime.version"));
+        return Primitives.VALUES.execute(new SimpleString(Version.getVersion()),
+                                         new SimpleString(jdkVersion));
     }