Changeset 4514
- Timestamp:
- 10/23/03 15:01:41 (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/j/src/org/armedbear/lisp/Java.java
r3999 r4514 3 3 * 4 4 * Copyright (C) 2002-2003 Peter Graves 5 * $Id: Java.java,v 1.1 1 2003-09-22 17:17:53piso Exp $5 * $Id: Java.java,v 1.12 2003-10-23 15:01:41 piso Exp $ 6 6 * 7 7 * This program is free software; you can redistribute it and/or … … 190 190 // ### jnew 191 191 // jnew constructor &rest args 192 private static final Primitive JNEW = new Primitive("jnew", PACKAGE_JAVA) { 192 private static final Primitive JNEW = new Primitive("jnew", PACKAGE_JAVA) 193 { 193 194 public LispObject execute(LispObject[] args) throws ConditionThrowable 194 195 { … … 205 206 else if (arg instanceof Fixnum) 206 207 initargs[i-1] = new Integer(((Fixnum)arg).getValue()); 208 else if (arg instanceof LispFloat) 209 initargs[i-1] = new Double(((LispFloat)arg).getValue()); 207 210 } 208 211 return new JavaObject(constructor.newInstance(initargs)); … … 216 219 // ### jcall 217 220 // jcall method instance &rest args 218 private static final Primitive JCALL = new Primitive("jcall", PACKAGE_JAVA) { 221 private static final Primitive JCALL = new Primitive("jcall", PACKAGE_JAVA) 222 { 219 223 public LispObject execute(LispObject[] args) throws ConditionThrowable 220 224 { … … 276 280 if (obj instanceof Boolean) 277 281 return ((Boolean)obj).booleanValue() ? T : NIL; 282 if (obj instanceof Integer) 283 return new Fixnum(((Integer)obj).intValue()); 278 284 if (obj instanceof Long) 279 285 return new Bignum(((Long)obj).longValue()); 280 if (obj instanceof Integer)281 return new Fixnum(((Integer)obj).intValue());286 if (obj instanceof Double || obj instanceof Float) 287 return new LispFloat(((Number)obj).doubleValue()); 282 288 if (obj instanceof String) 283 289 return new LispString((String)obj);
Note: See TracChangeset
for help on using the changeset viewer.