Changeset 15481

Timestamp:

11/04/20 20:05:11 (2 years ago)

Author:

Mark Evenson

Message:

arrays: fix fail to reset position after relative access

The position of all buffers should always be zero. TODO how to
unintrusively make this assertion?

We fix new types specializing (or (unsigned-byte 8) (unsigned-byte
32)) in BasicVector_ByteBuffer, ComplexArray_ByteBuffer,
ComplexVector_ByteBuffer, and ComplexVector_IntBuffer for relative
accesses which always advance the position of the
underlying java.nio.Buffer subclass.

Fixes <​https://github.com/armedbear/abcl/issues/345>.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• BasicVector_ByteBuffer.java (modified) (2 diffs)
• ComplexArray_ByteBuffer.java (modified) (1 diff)
• ComplexVector_ByteBuffer.java (modified) (2 diffs)
• ComplexVector_IntBuffer.java (modified) (2 diffs)

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

@@ -81 +81 @@
     for (int i = array.length; i-- > 0;) {
       // Faster please!
-      elements.put((byte)coerceToJavaByte(array[i]));
+      elements.put(i, (byte)coerceToJavaByte(array[i]));
     }
   }
@@ -199 +199 @@
     try {
       v.elements.put(view);
+      v.elements.position(0);
       return v;
     } catch (BufferOverflowException e) {

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

@@ -280 +280 @@
   public static void fill(ByteBuffer buffer, byte value) {
     for (int i = 0; i < ((java.nio.Buffer)buffer).limit(); i++) {
-      buffer.put(value);
+      buffer.put(i, value);
     }
   }

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

@@ -375 +375 @@
           newBuffer = ByteBuffer.allocate(minCapacity);
         }
-        newBuffer.put(elements); 
+        elements.position(0);
+        newBuffer.put(elements);
+        newBuffer.position(0);
         elements = newBuffer;
         capacity = minCapacity;
@@ -460 +462 @@
         byte b = coerceToJavaByte(initialElement);
         for (int i = capacity; i < newCapacity; i++) {
-          elements.put(b);
+          elements.put(i, b);
         }
       }

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

@@ -355 +355 @@
           newBuffer = IntBuffer.allocate(minCapacity);
         }
+        elements.position(0);
         newBuffer.put(elements);
+        newBuffer.position(0);
         elements = newBuffer;
         capacity = minCapacity;
@@ -437 +439 @@
         newElements.put(elements.array(),
                         0, Math.min(capacity, newCapacity));
+        newElements.position(0);
         elements = newElements;
       }