Changeset 12645

Timestamp:

05/01/10 20:21:50 (13 years ago)

Author:

ehuelsmann

Message:

Fix #93: Empty VALUES set in the reader treated as NIL.

File:

• trunk/abcl/src/org/armedbear/lisp/Stream.java (modified) (3 diffs)

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

@@ -658 +658 @@
                     _unreadChar(nextChar);
                 }
+
+                thread._values = null;
                 LispObject obj = processChar(c, rt);
                 if (obj == null) {
@@ -663 +665 @@
                     continue;
                 }
-                if (first == null) {
-                    first = new Cons(obj);
-                    last = first;
-                } else {
-                    Cons newCons = new Cons(obj);
-                    last.cdr = newCons;
-                    last = newCons;
+
+                if (! (obj == NIL && thread._values != null
+                       && thread._values.length == 0)) {
+                    // Don't add the return value NIL to the list
+                    // if the _values array indicates no values have been returned
+                    if (first == null) {
+                        first = new Cons(obj);
+                        last = first;
+                    } else {
+                        Cons newCons = new Cons(obj);
+                        last.cdr = newCons;
+                        last = newCons;
+                    }
                 }
             }
@@ -1440 +1448 @@
             if (c == delimiter)
                 break;
+
+            thread._values = null;
             LispObject obj = processChar(c, rt);
-            if (obj != null)
+            if (obj != null &&
+                ! (obj == NIL && thread._values != null
+                   && thread._values.length == 0))
+                // Don't add 'obj' to the list, if _values indicates
+                // no values have been returned
                 result = new Cons(obj, result);
         }