[armedbear-cvs] r14215 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Wed Oct 24 11:49:47 2012
New Revision: 14215

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

Modified:
   trunk/abcl/src/org/armedbear/lisp/Primitives.java
   trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java

Modified: trunk/abcl/src/org/armedbear/lisp/Primitives.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Primitives.java	Wed Oct 24 10:34:18 2012	(r14214)
+++ trunk/abcl/src/org/armedbear/lisp/Primitives.java	Wed Oct 24 11:49:47 2012	(r14215)
@@ -407,7 +407,7 @@
     };
 
     // ### 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() {
             super(Symbol.VALUES, "&rest object");

Modified: trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java	Wed Oct 24 10:34:18 2012	(r14214)
+++ trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java	Wed Oct 24 11:49:47 2012	(r14215)
@@ -34,6 +34,7 @@
 package org.armedbear.lisp;
 
 import java.math.BigInteger;
+import java.text.MessageFormat;
 
 // ### lisp_implementation_version
 // lisp_implementation_version <no arguments> => description
@@ -47,7 +48,14 @@
     @Override
     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));
     }
 
     private static final lisp_implementation_version LISP_IMPLEMENTATION_VERSION =