Add abstract base class for non-CVM CAD3 records

Author: mikera

…/main/java/convex/core/data/ANonCVM.java …n/java/convex/core/data/ACAD3Record.javaconvex-core/src/main/java/convex/core/data/ANonCVM.java renamed to convex-core/src/main/java/convex/core/data/ACAD3Record.java convex-core/src/main/java/convex/core/data/ANonCVM.java renamed to convex-core/src/main/java/convex/core/data/ACAD3Record.java

@@ -5,10 +5,15 @@
 import convex.core.lang.RT;
 
 /**
- * Abstract base class for non-CVM values. These should always have an encoding
- * since the only way to create them is load from network or storage
+ * Abstract base class for non-CVM CAD3 Records values. These look like countable sequences to CVM code.
+ * 
+ * These should always have an encoding since the only way to create them is load from network or storage
  */
-public class ANonCVM extends ACell {
+public abstract class ACAD3Record extends ASequence<ACell> {
+
+	public ACAD3Record(long count) {
+		super(count);
+	}
 
 	@Override
 	public int estimatedEncodingSize() {

convex-core/src/main/java/convex/core/data/ASequence.java

@@ -110,13 +110,6 @@ public final boolean addAll(int index, Collection<? extends T> c) {
 	public T get(int index) {
 		return get((long) index);
 	}
-	
-	/**
-	 * Sequences are always valid CVM values
-	 */
-	@Override public final boolean isCVMValue() {
-		return true;
-	}
 
 	@Override
 	public abstract T get(long index);

convex-core/src/main/java/convex/core/data/AVector.java

@@ -183,6 +183,11 @@ public final ListIterator<T> listIterator(int index) {
 	 */
 	@Override
 	public abstract boolean isCanonical();
+	
+	@Override public final boolean isCVMValue() {
+		// Vectors are always valid CVM values
+		return true;
+	}
 
 	@Override
 	public abstract AVector<T> updateRefs(IRefFunction func);

convex-core/src/main/java/convex/core/data/List.java

@@ -236,6 +236,11 @@ public boolean isCanonical() {
 		return true;
 	}
 
+	@Override public final boolean isCVMValue() {
+		// Lists are always valid CVM values
+		return true;
+	}
+	
 	@Override
 	public boolean print(BlobBuilder bb, long limit) {
 		bb.append('(');

convex-core/src/test/java/convex/core/data/CAD3Test.java

@@ -29,6 +29,7 @@ public class CAD3Test {
 	@Test public void testReadEncodings() {
 		assertSame(Address.ZERO,Reader.read("#[2100]"));
 		assertSame(CVMLong.ZERO,Reader.read("#[10]"));
+		assertSame(Vectors.empty(),Reader.read("#[8000]"));
 		assertNull(Reader.read("#[00]"));
 		assertEquals(ExtensionValue.create((byte) 0xe5, 0),Reader.read("#[e500]"));
 	}

convex-core/src/test/java/convex/core/data/ObjectsTest.java

@@ -29,8 +29,8 @@
  */
 public class ObjectsTest {
 	/**
-	 * Generic tests for any valid CVM Value (including null). Should pass for
-	 * *any* ACell where RT.isCVM(..) returns true and validate(...) succeeds.
+	 * Generic tests for any valid Value (including null). Should pass for
+	 * *any* non-partial cell where validate(...) succeeds.
 	 * 
 	 * @param a Value to test
 	 */