Changeset 14698

Timestamp:

04/27/14 14:12:38 (9 years ago)

Author:

Mark Evenson

Message:

Backport r14694: Convert Lisp truth values to Java equivalents in JCALL/JSTATIC.

We now convert CL:T and CL:NIL to JAVA:+TRUE+ and JAVA:+FALSE+
respectively when invoking JVM methods through the JAVA package,
establishing the "natural" equivalence for boolean truth values. This
may break some existing usage in that previously CL:NIL was converted
to a Java 'null' reference. Users now need to specify JAVA:+NULL+
explicitly when desiring to pass 'null' Java references as an argument
in invoking JVM methods.

Addresses <​http://abcl.org/trac/ticket/84> (#84) and
<​http://abcl.org/trac/ticket/339> (#339).

Location:

branches/1.3.1

Files:

• abcl.asd (modified) (2 diffs)
• src/org/armedbear/lisp/Java.java (modified) (4 diffs)
• test/lisp/abcl/java-tests.lisp (modified) (1 diff)
• test/lisp/abcl/java.lisp (copied) (copied from trunk/abcl/test/lisp/abcl/java.lisp)

branches/1.3.1/abcl.asd

@@ -18 +18 @@
 ;;; could be possibly be done at finer granularity in the files
 ;;; themselves.
-(defsystem :abcl-test-lisp :version "1.2" :components
+(defsystem :abcl-test-lisp :version "1.3.0" :components
      ((:module abcl-rt 
                      :pathname "test/lisp/abcl/" :serial t :components
@@ -60 +60 @@
                       #+abcl 
                       (:file "zip")
+                      #+abcl 
+                      (:file "java")
                       #+abcl
                       (:file "pathname-tests" :depends-on 

branches/1.3.1/src/org/armedbear/lisp/Java.java

@@ -458 +458 @@
                         error(new LispError("no such method"));
                 }
-            } else
+            } else {
               type_error(methodRef, Symbol.STRING);
+            }
             Object[] methodArgs = new Object[args.length-2];
             Class[] argTypes = m.getParameterTypes();
             for (int i = 2; i < args.length; i++) {
                 LispObject arg = args[i];
-                if (arg == NIL)
-                    methodArgs[i-2] = null;
-                else
-                    methodArgs[i-2] = arg.javaInstance(argTypes[i-2]);
+                if (arg.equals(NIL)) {
+                  methodArgs[i-2] = false;
+                } else if (arg.equals(T)) {
+                  methodArgs[i-2] = true;
+                } else {
+                  methodArgs[i-2] = arg.javaInstance(argTypes[i-2]);
+                }
             }
             m.setAccessible(true);
@@ -563 +567 @@
                 for (int i = 1; i < args.length; i++) {
                     LispObject arg = args[i];
-                    if (arg == NIL)
-                        initargs[i-1] = null;
-                    else {
-                        initargs[i-1] = arg.javaInstance(argTypes[i-1]);
+                    if (arg.equals(NIL)) {
+                      initargs[i-1] = false ;
+                    } else if (arg.equals(T)) {
+                      initargs[i-1] = true;
+                    } else {
+                      initargs[i-1] = arg.javaInstance(argTypes[i-1]);
                     }
                 }
@@ -879 +885 @@
             methodArgs = new Object[argTypes.length];
             for (int i = 2; i < args.length; i++) {
-                LispObject arg = args[i];
-                if (arg == NIL)
-                    methodArgs[i-2] = null;
-                else
-                    methodArgs[i-2] = arg.javaInstance(argTypes[i-2]);
+              LispObject arg = args[i];
+              if (arg.equals(NIL)) {
+                methodArgs[i-2] = false;
+              } else if (arg.equals(T)) {
+                methodArgs[i-2] = true;
+              } else {
+                methodArgs[i-2] = arg.javaInstance(argTypes[i-2]);
+              }
             }
             if (!method.isAccessible()) {
@@ -924 +933 @@
         Object[] javaArgs = new Object[argCount];
         for (int i = 0; i < argCount; ++i) {
-            Object x = args[i + offs];
-            if (x == NIL) {
-                javaArgs[i] = null;
-            } else {
-                javaArgs[i] = ((LispObject) x).javaInstance();
-            }
+          Object x = args[i + offs];
+          if (x.equals(NIL)) {
+            javaArgs[i] = false;
+          } else if (x.equals(T)) {
+            javaArgs[i] = true;
+          } else {
+            javaArgs[i] = ((LispObject) x).javaInstance();
+          }
         }
   return javaArgs;

branches/1.3.1/test/lisp/abcl/java-tests.lisp

@@ -447 +447 @@
 ;;#+allegro
 ;;(jlinker-end)
+