Changeset 15381

Timestamp:

09/26/20 07:32:00 (3 years ago)

Author:

Mark Evenson

Message:

JNEW-ARRAY-FROM-ARRAY constructs more types of java arrays

(jnew-array-from-array "char" #(0 244 2 3))

File:

• trunk/abcl/src/org/armedbear/lisp/Java.java (modified) (1 diff)

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

@@ -729 +729 @@
                 Object value = v.javaInstance();
                 int index = ((Integer)args[args.length - 1].javaInstance()).intValue();
-                if (value instanceof java.lang.Number
-                    && a.getClass().getComponentType().equals(Byte.TYPE)) {
-                    Array.setByte(a, index, ((java.lang.Number)value).byteValue());
+                if (value instanceof java.lang.Number) {
+                  Class type = a.getClass().getComponentType();
+                  Number number = (java.lang.Number)value;
+                  if (type.equals(Byte.TYPE)) {
+                    Array.setByte(a, index, number.byteValue());
+                  } else if (type.equals(Short.TYPE)) {
+                    Array.setShort(a, index, number.shortValue()); 
+                  } else if (type.equals(Character.TYPE)) {
+                    Array.setChar(a, index, (char)number.intValue()); // FIXME: value out of range
+                  } else if (type.equals(Integer.TYPE)) {
+                    Array.setInt(a, index, number.intValue()); 
+                  } else if (type.equals(Long.TYPE)) {
+                    Array.setLong(a, index, number.longValue()); 
+                  } else if (type.equals(Float.TYPE)) {
+                    Array.setFloat(a, index, number.floatValue()); 
+                  } else if (type.equals(Double.TYPE)) {
+                    Array.setDouble(a, index, number.doubleValue()); 
+                  } else if (type.equals(Boolean.TYPE)) {
+                    Array.setBoolean(a, index, number.equals(0) ? false : true); 
+                  } else {
+                    Array.set(a, index, value);
+                  }
                 } else {
                     Array.set(a, index, value);