Misc tests and checks

Author: mikera

convex-core/src/main/java/convex/core/cvm/ARecordGeneric.java

@@ -124,7 +124,7 @@ protected void validateCell() throws InvalidDataException {
 		Cells.validateCell(values);
 	}
 
-	protected void validateStructure() throws InvalidDataException {
+	public void validateStructure() throws InvalidDataException {
 		super.validateStructure();
 		if (values.count()!=format.count()) {
 			throw new InvalidDataException("Expected "+format.count()+ "Record values but was: "+values.count(),this);

convex-core/src/main/java/convex/core/cvm/CVMEncoder.java

@@ -23,7 +23,10 @@ public ACell read(Blob encoding,int offset) throws BadFormatException {
 	protected ACell readExtension(byte tag, Blob blob, int offset) throws BadFormatException {
 		// We expect a VLQ Count following the tag
 		long code=Format.readVLQCount(blob,offset+1);
-		if (tag == CVMTag.CORE_DEF) return Core.fromCode(code);
+		if (tag == CVMTag.CORE_DEF) {
+			ACell cc=Core.fromCode(code);
+			if (cc!=null) return cc;
+		}
 		if (tag == CVMTag.ADDRESS) return Address.create(code);
 
 		return ExtensionValue.create(tag, code);

convex-core/src/main/java/convex/core/cvm/Syntax.java

@@ -244,6 +244,7 @@ public void validateStructure() throws InvalidDataException {
 				throw new InvalidDataException("Cannot double-wrap a Syntax value",this);
 			}
 		}
+		meta.validateStructure();
 	}
 
 	@Override

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

@@ -370,7 +370,8 @@ public void validateCell() throws InvalidDataException {
 	}
 
 	@Override
-	protected void validateStructure() {
+	public void validateStructure() throws InvalidDataException {
+		super.validateStructure();
 		// nothing to do by default
 	}
 

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

@@ -31,7 +31,8 @@ public void validateCell() throws InvalidDataException {
 	}
 
 	@Override
-	protected void validateStructure() throws InvalidDataException {
+	public void validateStructure() throws InvalidDataException {
+		super.validateStructure();
 		// Nothing to do, any child refs are valid
 	}
 

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

@@ -52,7 +52,7 @@ public void validate() throws InvalidDataException {
 	 * 
 	 * @throws InvalidDataException  If the Cell is invalid
 	 */
-	protected void validateStructure() throws InvalidDataException {
+	public void validateStructure() throws InvalidDataException {
 		// nothing by default
 	}
 

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

@@ -32,7 +32,7 @@ public void validateCell() throws InvalidDataException {
 	}
 
 	@Override
-	protected void validateStructure() throws InvalidDataException {
+	public void validateStructure() throws InvalidDataException {
 		// Nothing to do, any child refs are valid
 	}
 

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

@@ -526,7 +526,10 @@ private static ACell readExtension(byte tag, Blob blob, int offset) throws BadFo
 		// We expect a VLQ Count following the tag
 		long code=readVLQCount(blob,offset+1);
 
-		if (tag == CVMTag.CORE_DEF) return Core.fromCode(code);
+		if (tag == CVMTag.CORE_DEF) {
+			ACell cc=Core.fromCode(code);
+			if (cc!=null) return cc;
+		}
 
 		if ((tag == CVMTag.OP_SPECIAL)&&(code<Special.NUM_SPECIALS)) {
 			Special<?> spec= Special.create((int)code);

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

@@ -685,7 +685,7 @@ protected void validateCell() throws InvalidDataException {
 	}
 
 	@Override
-	protected void validateStructure() throws InvalidDataException {
+	public void validateStructure() throws InvalidDataException {
 		super.validateStructure();
 		long c = 0;
 		int blen = children.length;

convex-core/src/main/java/convex/core/lang/Core.java

@@ -3009,14 +3009,12 @@ private static Context applyDocumentation(Context ctx) throws IOException {
  	 * Read a Core definition from an encoding
  	 * @param b Blob containing encoding
  	 * @param pos Position to read Core code function
- 	 * @return Singleton cell representing the Core value
- 	 * @throws BadFormatException In case of encoding error
+ 	 * @return Singleton cell representing the Core value, or null if not defined
  	 */
 	public static ACell fromCode(long code) throws BadFormatException {
-		if (code <0 || code>=CODE_MAP.length) throw new BadFormatException("Core code out of range: "+code);
+		if (code <0 || code>=CODE_MAP.length) return null;
 
 		ACell o = CODE_MAP[(int)code];
-		if (o == null) throw new BadFormatException("Core code definition not found: " + code);
 		return o;
 	}