Changeset 14215


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Primitives.java

    r14133 r14215  
    408408
    409409    // ### values
    410     private static final Primitive VALUES = new pf_values();
     410    public static final Primitive VALUES = new pf_values();
    411411    private static final class pf_values extends Primitive {
    412412        pf_values() {
  • trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java

    r11488 r14215  
    3535
    3636import java.math.BigInteger;
     37import java.text.MessageFormat;
    3738
    3839// ### lisp_implementation_version
     
    4849    public LispObject execute()
    4950    {
    50         return new SimpleString(Version.getVersion());
     51        String vendor = System.getProperty("java.vendor");
     52        vendor = vendor.replace(" ", "_");
     53        String jdkVersion = MessageFormat.format("{0}-{1}-{2})",
     54                                          vendor,
     55                                          System.getProperty("os.arch"),
     56                                          System.getProperty("java.runtime.version"));
     57        return Primitives.VALUES.execute(new SimpleString(Version.getVersion()),
     58                                         new SimpleString(jdkVersion));
    5159    }
    5260
Note: See TracChangeset for help on using the changeset viewer.