Changeset 4514

Timestamp:

10/23/03 15:01:41 (18 years ago)

Author:

piso

Message:

JNEW, makeLispObject(): added float support (Doug McNaught?).

File:

• trunk/j/src/org/armedbear/lisp/Java.java (modified) (5 diffs)

trunk/j/src/org/armedbear/lisp/Java.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Java.java,v 1.11 2003-09-22 17:17:53 piso Exp $
+ * $Id: Java.java,v 1.12 2003-10-23 15:01:41 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -190 +190 @@
     // ### jnew
     // jnew constructor &rest args
-    private static final Primitive JNEW = new Primitive("jnew", PACKAGE_JAVA) {
+    private static final Primitive JNEW = new Primitive("jnew", PACKAGE_JAVA)
+    {
         public LispObject execute(LispObject[] args) throws ConditionThrowable
         {
@@ -205 +206 @@
                     else if (arg instanceof Fixnum)
                         initargs[i-1] = new Integer(((Fixnum)arg).getValue());
+                    else if (arg instanceof LispFloat)
+                        initargs[i-1] = new Double(((LispFloat)arg).getValue());
                 }
                 return new JavaObject(constructor.newInstance(initargs));
@@ -216 +219 @@
     // ### jcall
     // jcall method instance &rest args
-    private static final Primitive JCALL = new Primitive("jcall", PACKAGE_JAVA) {
+    private static final Primitive JCALL = new Primitive("jcall", PACKAGE_JAVA)
+    {
         public LispObject execute(LispObject[] args) throws ConditionThrowable
         {
@@ -276 +280 @@
         if (obj instanceof Boolean)
             return ((Boolean)obj).booleanValue() ? T : NIL;
+        if (obj instanceof Integer)
+            return new Fixnum(((Integer)obj).intValue());
         if (obj instanceof Long)
             return new Bignum(((Long)obj).longValue());
-        if (obj instanceof Integer)
-            return new Fixnum(((Integer)obj).intValue());
+        if (obj instanceof Double || obj instanceof Float)
+            return new LispFloat(((Number)obj).doubleValue());
         if (obj instanceof String)
             return new LispString((String)obj);