Changeset 12322

Timestamp:

01/01/10 19:34:30 (14 years ago)

Author:

ehuelsmann

Message:

Follow up to r12321; changes resulting from more testing.

File:

• trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java

@@ -51 +51 @@
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
+import org.armedbear.lisp.Debug;
 
 public class RandomAccessCharacterFile {
@@ -374 +375 @@
                 // catching MalformedInput
                 throw new RACFMalformedInputException(bbuf.position(),
-                                                      bbuf.get(bbuf.position()),
+                                                      (char)bbuf.get(bbuf.position()),
                                                       cset.name());
             if (r.isUnmappable())
@@ -380 +381 @@
                 // to map all characters
                 Debug.assertTrue(false);
-            if (CoderResult.OVERFLOW == r)
-                Debug.assertTrue(false);
+            // OVERFLOW is a normal condition:
+            //  it's equal to cbuf.remaining() == 0
+            // ### EHU: really??? EXACTLY equal??
         }
         if (cbuf.remaining() == len) {
@@ -425 +427 @@
                                                       cset.name());
             }
-            if (CoderResult.UNDERFLOW == r)
-                Debug.assertTrue(false);
+            // UNDERFLOW is the normal condition where cbuf runs out
+            // before bbuf is filled.
         }
         if (bbuf.position() > 0 && bbufIsDirty && flush) {