Changeset 8481

Timestamp:

02/06/05 01:36:17 (18 years ago)

Author:

piso

Message:

readList() => readList(boolean requireProper)

File:

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

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003-2005 Peter Graves
- * $Id: Stream.java,v 1.110 2005-02-06 01:15:56 piso Exp $
+ * $Id: Stream.java,v 1.111 2005-02-06 01:36:17 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -340 +340 @@
     }
 
-    public LispObject readList() throws ConditionThrowable
+    public LispObject readList(boolean requireProper) throws ConditionThrowable
     {
         Cons first = null;
@@ -362 +362 @@
                     }
                     LispObject obj = read(true, NIL, true);
+                    if (requireProper) {
+                        if (!obj.listp())
+                            signal(new ReaderError("The value " +
+                                                   obj.writeToString() +
+                                                   " is not of type LIST."));
+                    }
                     last.setCdr(obj);
                     continue;