Tag refactoring

Convex-Dev · Dec 1, 2024 · 4b2f6df · 4b2f6df
1 parent 540defd
commit 4b2f6df
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 22 deletions.
diff --git a/convex-core/src/main/java/convex/core/cvm/AFn.java b/convex-core/src/main/java/convex/core/cvm/AFn.java
@@ -3,7 +3,6 @@
 import convex.core.data.ACell;
 import convex.core.data.Cells;
 import convex.core.data.IRefFunction;
-import convex.core.data.Tag;
 import convex.core.data.type.AType;
 import convex.core.data.type.Types;
 
@@ -50,7 +49,7 @@ public boolean supportsArgs(ACell[] args) {
 
 	@Override
 	public byte getTag() {
-		return Tag.FN;
+		return CVMTag.FN;
 	}
 
 

diff --git a/convex-core/src/main/java/convex/core/cvm/AOp.java b/convex-core/src/main/java/convex/core/cvm/AOp.java
@@ -4,7 +4,6 @@
 import convex.core.data.Cells;
 import convex.core.data.Format;
 import convex.core.data.IRefFunction;
-import convex.core.data.Tag;
 import convex.core.data.type.AType;
 import convex.core.data.type.Types;
 
@@ -87,7 +86,7 @@ public int encodeRaw(byte[] bs, int pos) {
 
 	@Override
 	public byte getTag() {
-		return Tag.OP;
+		return CVMTag.OP;
 	}
 
 	@Override

diff --git a/convex-core/src/main/java/convex/core/cvm/CVMTag.java b/convex-core/src/main/java/convex/core/cvm/CVMTag.java
@@ -12,7 +12,6 @@ public class CVMTag {
 	 */
 	public static final byte ADDRESS = (byte) 0xEA;
 
-
 	public static final byte SYNTAX = (byte) 0x88;
 
 	// ==========================================
@@ -75,5 +74,14 @@ public class CVMTag {
 	public static final byte CORE_DEF = (byte) 0xED;
 
 
+	// CVM Code
+	public static final byte OP = (byte) 0xC0;
+
+
+	public static final byte FN = (byte) 0xCF;
+
+	public static final byte FN_MULTI = (byte) 0xCB;
+
+
 
 }
diff --git a/convex-core/src/main/java/convex/core/data/Format.java b/convex-core/src/main/java/convex/core/data/Format.java
@@ -502,15 +502,15 @@ private static <T extends ACell> T readDataStructure(byte tag, Blob b, int pos)
 	private static ACell readCode(byte tag, Blob b, int pos) throws BadFormatException {
 
 
-		if (tag == Tag.OP) return Ops.read(b, pos);
+		if (tag == CVMTag.OP) return Ops.read(b, pos);
 
 
-		if (tag == Tag.FN_MULTI) {
+		if (tag == CVMTag.FN_MULTI) {
 			AFn<?> fn = MultiFn.read(b,pos);
 			return fn;
 		}
 
-		if (tag == Tag.FN) {
+		if (tag == CVMTag.FN) {
 			AFn<?> fn = Fn.read(b,pos);
 			return fn;
 		}

diff --git a/convex-core/src/main/java/convex/core/data/Tag.java b/convex-core/src/main/java/convex/core/data/Tag.java
@@ -65,8 +65,6 @@ public class Tag {
 	// Sparsely coded record (0xAx)
 	public static final byte SPARSE_RECORD_BASE = (byte) 0xA0;
 
-
-
 	//=========================
 	// Byte Flags (0xBx)
 
@@ -78,11 +76,6 @@ public class Tag {
 
 	public static final byte CODE_BASE = (byte) 0xC0;
 
-	// CVM Code
-	public static final byte OP = (byte) 0xC0;
-	public static final byte FN = (byte) 0xCF;
-	public static final byte FN_MULTI = (byte) 0xCB;
-
 	// ==========================================
 	// Densely coded record (0xDx)
 	public static final byte DENSE_RECORD_BASE = (byte) 0xD0;

diff --git a/convex-core/src/main/java/convex/core/lang/impl/Fn.java b/convex-core/src/main/java/convex/core/lang/impl/Fn.java
@@ -1,6 +1,7 @@
 package convex.core.lang.impl;
 
 import convex.core.cvm.AOp;
+import convex.core.cvm.CVMTag;
 import convex.core.cvm.Context;
 import convex.core.cvm.Symbols;
 import convex.core.data.ACell;
@@ -10,7 +11,6 @@
 import convex.core.data.Format;
 import convex.core.data.IRefFunction;
 import convex.core.data.Ref;
-import convex.core.data.Tag;
 import convex.core.data.util.BlobBuilder;
 import convex.core.exceptions.BadFormatException;
 import convex.core.exceptions.InvalidDataException;
@@ -107,7 +107,7 @@ public boolean isCanonical() {
 
 	@Override
 	public int encode(byte[] bs, int pos) {
-		bs[pos++]=Tag.FN;
+		bs[pos++]=CVMTag.FN;
 		return encodeRaw(bs,pos);
 	}
 

diff --git a/convex-core/src/main/java/convex/core/lang/impl/MultiFn.java b/convex-core/src/main/java/convex/core/lang/impl/MultiFn.java
@@ -1,6 +1,7 @@
 package convex.core.lang.impl;
 
 import convex.core.cvm.AFn;
+import convex.core.cvm.CVMTag;
 import convex.core.cvm.Context;
 import convex.core.data.ACell;
 import convex.core.data.AVector;
@@ -9,7 +10,6 @@
 import convex.core.data.Format;
 import convex.core.data.IRefFunction;
 import convex.core.data.Ref;
-import convex.core.data.Tag;
 import convex.core.data.util.BlobBuilder;
 import convex.core.exceptions.BadFormatException;
 import convex.core.exceptions.InvalidDataException;
@@ -101,7 +101,7 @@ public void validateCell() throws InvalidDataException {
 
 	@Override
 	public int encode(byte[] bs, int pos) {
-		bs[pos++]=Tag.FN_MULTI;
+		bs[pos++]=CVMTag.FN_MULTI;
 		return encodeRaw(bs,pos);
 	}
 

diff --git a/convex-core/src/test/java/convex/core/data/AdversarialDataTest.java b/convex-core/src/test/java/convex/core/data/AdversarialDataTest.java
@@ -163,7 +163,7 @@ public class AdversarialDataTest {
 	}
 
 	@Test public void testBadConstant() {
-		invalidEncoding(Tag.OP+Ops.CONSTANT,"");
+		invalidEncoding(CVMTag.OP+Ops.CONSTANT,"");
 	}
 
 	@Test public void testBadSymbols() {

diff --git a/convex-core/src/test/java/convex/core/lang/OpsTest.java b/convex-core/src/test/java/convex/core/lang/OpsTest.java
@@ -84,7 +84,7 @@ public void testConstant() {
 			assertNull(c2.getResult());
 			doOpTest(op);
 
-			assertEquals(Blob.wrap(new byte[] {Tag.OP,Ops.CONSTANT,Tag.NULL}),op.getEncoding());
+			assertEquals(Blob.wrap(new byte[] {CVMTag.OP,Ops.CONSTANT,Tag.NULL}),op.getEncoding());
 		}
 
 		{// nested constant
@@ -95,7 +95,7 @@ public void testConstant() {
 			assertEquals(Constant.nil(),c2.getResult());
 			doOpTest(op);
 
-			assertEquals(Blob.wrap(new byte[] {Tag.OP,Ops.CONSTANT,Tag.OP,Ops.CONSTANT,Tag.NULL}),op.getEncoding());
+			assertEquals(Blob.wrap(new byte[] {CVMTag.OP,Ops.CONSTANT,CVMTag.OP,Ops.CONSTANT,Tag.NULL}),op.getEncoding());
 		}
 	}