Fix to the signature of AzraelReader

sylvainhalle · Jan 8, 2023 · 11d0b46 · 11d0b46
1 parent 1a5d4b1
commit 11d0b46
Show file tree

Hide file tree

Showing 26 changed files with 184 additions and 51 deletions.
diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/BlobSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/BlobSchema.java
@@ -71,8 +71,13 @@ public BitSequence print(Object o) throws PrintException
 	}
 
 	@Override
-	public BitSequence read(BitSequence s) throws ReadException
+	public BitSequence read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence s = (BitSequence) o;
 		long length = m_intSchema.read(s).longValue();
 		if (s.size() < length)
 		{

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/BooleanSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/BooleanSchema.java
@@ -41,9 +41,9 @@ protected BooleanSchema()
 	}
 
 	@Override
-	public Boolean read(BitSequence t) throws ReadException
+	public Boolean read(Object o) throws ReadException
 	{
-		return (Boolean) super.read(t);
+		return (Boolean) super.read(o);
 	}
 
 	@Override

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/ByteArraySchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/ByteArraySchema.java
@@ -45,9 +45,14 @@ public BitSequence print(Object o) throws PrintException
 	}
 
 	@Override
-	public byte[] read(BitSequence o) throws ReadException
+	public byte[] read(Object o) throws ReadException
 	{
-		BitSequence seq = (BitSequence) BlobSchema.blob32.read(o);
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence s = (BitSequence) o;
+		BitSequence seq = (BitSequence) BlobSchema.blob32.read(s);
 		return seq.toByteArray();
 	}
 }
diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/ClassSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/ClassSchema.java
@@ -33,8 +33,13 @@ public ClassSchema(Class<?> ... classes)
 	}
 
 	@Override
-	public Class<?> read(BitSequence t) throws ReadException
+	public Class<?> read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence t = (BitSequence) o;
 		BitSequence is_shortcut = t.truncatePrefix(1);
 		if (is_shortcut.get(0))
 		{

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/EnumSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/EnumSchema.java
@@ -55,8 +55,13 @@ public EnumSchema(Object ... entries)
 	}
 
 	@Override
-	public Object read(BitSequence t) throws ReadException
+	public Object read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence t = (BitSequence) o;
 		BitSequence k = t.truncatePrefix(m_intSchema.getWidth());
 		if (!m_fromBits.containsKey(k))
 		{

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/FixedMapSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/FixedMapSchema.java
@@ -103,16 +103,21 @@ public BitSequence print(Object o) throws PrintException
 	}
 
 	@Override
-	public Map<String,?> read(BitSequence s) throws ReadException
+	public Map<String,?> read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence s = (BitSequence) o;
 		Map<String,Object> map = new HashMap<String,Object>();
 		for (String k : m_keys)
 		{
 			BitSequence has_entry = s.truncatePrefix(1);
 			if (has_entry.get(0))
 			{
-				Object o = m_valueType.read(s);
-				map.put(k, o);
+				Object o2 = m_valueType.read(s);
+				map.put(k, o2);
 			}
 			else
 			{

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/HuffstringSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/HuffstringSchema.java
@@ -39,8 +39,13 @@ public HuffstringSchema(HuffNode tree)
 	}
 
 	@Override
-	public String read(BitSequence t) throws ReadException
+	public String read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence t = (BitSequence) o;
 		StringBuilder out = new StringBuilder();
 		String c = null;
 		do

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/IntSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/IntSchema.java
@@ -145,8 +145,13 @@ public BitSequence print(Object o) throws PrintException
 	}
 
 	@Override
-	public Number read(BitSequence bs) throws ReadException
+	public Number read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence bs = (BitSequence) o;
 		long i_value = 0;
 		if (m_numBits > bs.size())
 		{

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/ListSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/ListSchema.java
@@ -35,8 +35,13 @@ public ListSchema(Schema element_schema)
 	}
 
 	@Override
-	public List<?> read(BitSequence t) throws ReadException
+	public List<?> read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence t = (BitSequence) o;
 		int size = IntSchema.int16.read(t).intValue();
 		if (t.size() < size)
 		{
@@ -45,13 +50,18 @@ public List<?> read(BitSequence t) throws ReadException
 		return read(t, size);
 	}
 
-	protected List<Object> read(BitSequence t, int size) throws ReadException
+	protected List<Object> read(Object o, int size) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence t = (BitSequence) o;
 		List<Object> list = new ArrayList<Object>(size);
 		for (int i = 0; i < size; i++)
 		{
-			Object o = m_elementSchema.read(t);
-			list.add(o);
+			Object o2 = m_elementSchema.read(t);
+			list.add(o2);
 		}
 		return list;
 	}

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/NullSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/NullSchema.java
@@ -43,7 +43,7 @@ protected NullSchema()
 	}
 
 	@Override
-	public Object read(BitSequence t) throws ReadException
+	public Object read(Object o) throws ReadException
 	{
 		return null;
 	}

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/NupleSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/NupleSchema.java
@@ -37,9 +37,9 @@ public NupleSchema(Schema element_schema, int size)
 	}
 
 	@Override
-	public List<?> read(BitSequence t) throws ReadException
+	public List<?> read(Object o) throws ReadException
 	{
-		return read(t, m_size);
+		return read(o, m_size);
 	}
 
 	@Override

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/ReflectiveSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/ReflectiveSchema.java
@@ -42,7 +42,7 @@ public ReflectiveSchema()
 	}
 
 	@Override
-	public Schema read(BitSequence t) throws ReadException
+	public Schema read(Object t) throws ReadException
 	{
 		return (Schema) super.read(t);
 	}
@@ -55,7 +55,7 @@ protected ByteArrayReflectiveSchema()
 		}
 
 		@Override
-		public ByteArraySchema read(BitSequence t) throws ReadException
+		public ByteArraySchema read(Object o) throws ReadException
 		{
 			return ByteArraySchema.instance;
 		}
@@ -75,7 +75,7 @@ protected ListReflectiveSchema()
 		}
 
 		@Override
-		public ListSchema read(BitSequence t) throws ReadException
+		public ListSchema read(Object t) throws ReadException
 		{
 			Schema element_schema = ReflectiveSchema.this.read(t);
 			return new ListSchema(element_schema);
@@ -96,7 +96,7 @@ public BitSequence print(Object o) throws PrintException
 
 	protected class FixedMapReflectiveSchema implements Schema
 	{
-		protected static final ListSchema s_listSchema = new ListSchema(StringBlobSchema.instance);
+		protected final ListSchema s_listSchema = new ListSchema(StringBlobSchema.instance);
 
 		protected FixedMapReflectiveSchema()
 		{
@@ -105,7 +105,7 @@ protected FixedMapReflectiveSchema()
 
 		@SuppressWarnings("unchecked")
 		@Override
-		public FixedMapSchema read(BitSequence t) throws ReadException
+		public FixedMapSchema read(Object t) throws ReadException
 		{
 			List<String> keys = (List<String>) s_listSchema.read(t);
 			Schema value_type = ReflectiveSchema.this.read(t);
@@ -128,9 +128,9 @@ public BitSequence print(Object o) throws PrintException
 
 	protected class VariantReflectiveSchema implements Schema
 	{
-		protected static final ListSchema s_classListSchema = new ListSchema(new ClassSchema(Boolean.class, Integer.class, String.class, List.class, Map.class));
+		protected final ListSchema s_classListSchema = new ListSchema(new ClassSchema(Boolean.class, Integer.class, String.class, List.class, Map.class));
 
-		protected static final ListSchema s_blobListSchema = new ListSchema(BlobSchema.blob32);
+		protected final ListSchema s_blobListSchema = new ListSchema(BlobSchema.blob32);
 
 		protected VariantReflectiveSchema()
 		{
@@ -139,7 +139,7 @@ protected VariantReflectiveSchema()
 
 		@SuppressWarnings("unchecked")
 		@Override
-		public VariantSchema read(BitSequence t) throws ReadException
+		public VariantSchema read(Object t) throws ReadException
 		{
 			List<Class<?>> class_names = (List<Class<?>>) s_classListSchema.read(t);
 			List<BitSequence> schemas = (List<BitSequence>) s_blobListSchema.read(t);
@@ -199,7 +199,7 @@ protected BooleanReflectiveSchema()
 		}
 
 		@Override
-		public BooleanSchema read(BitSequence t) throws ReadException
+		public BooleanSchema read(Object t) throws ReadException
 		{
 			return BooleanSchema.instance;
 		}
@@ -223,7 +223,7 @@ protected StringBlobReflectiveSchema()
 		}
 
 		@Override
-		public StringBlobSchema read(BitSequence t) throws ReadException
+		public StringBlobSchema read(Object t) throws ReadException
 		{
 			return StringBlobSchema.instance;
 		}
@@ -247,7 +247,7 @@ protected SmallsciiReflectiveSchema()
 		}
 
 		@Override
-		public SmallsciiSchema read(BitSequence t) throws ReadException
+		public SmallsciiSchema read(Object t) throws ReadException
 		{
 			return SmallsciiSchema.instance;
 		}
@@ -271,7 +271,7 @@ protected BlobReflectiveSchema()
 		}
 
 		@Override
-		public BlobSchema read(BitSequence t) throws ReadException
+		public BlobSchema read(Object t) throws ReadException
 		{
 			return BlobSchema.blob32;
 		}
@@ -295,7 +295,7 @@ protected IntReflectiveSchema()
 		}
 
 		@Override
-		public IntSchema read(BitSequence t) throws ReadException
+		public IntSchema read(Object t) throws ReadException
 		{
 			boolean signed = BooleanSchema.instance.read(t);
 			int num_bits = IntSchema.int8.read(t).intValue();
@@ -329,7 +329,7 @@ public SelfDescribedSchema(Schema s)
 		}
 
 		@Override
-		public Object read(BitSequence t) throws ReadException
+		public Object read(Object t) throws ReadException
 		{
 			// TODO Auto-generated method stub
 			return null;

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/SelfDescribedObject.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/SelfDescribedObject.java
@@ -51,11 +51,16 @@ public static class SelfDescribedObjectSchema implements Schema
 		protected static final ReflectiveSchema s_reflectiveSchema = new ReflectiveSchema();
 
 		@Override
-		public SelfDescribedObject read(BitSequence t) throws ReadException
+		public SelfDescribedObject read(Object o) throws ReadException
 		{
+			if (!(o instanceof BitSequence))
+			{
+				throw new ReadException("Expected a bit sequence");
+			}
+			BitSequence t = (BitSequence) o;
 			Schema o_s = s_reflectiveSchema.read(t);
-			Object o = o_s.read(t);
-			return new SelfDescribedObject(o_s, o);
+			Object o2 = o_s.read(t);
+			return new SelfDescribedObject(o_s, o2);
 		}
 
 		@Override

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/SmallsciiSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/SmallsciiSchema.java
@@ -90,8 +90,13 @@ public BitSequence print(Object o) throws PrintException
 	}
 
 	@Override
-	public String read(BitSequence s) throws ReadException
+	public String read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence s = (BitSequence) o;
 		StringBuilder sb = new StringBuilder();
 		while (s.size() >= 6)
 		{

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/StringBlobSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/StringBlobSchema.java
@@ -47,8 +47,13 @@ public BitSequence print(Object o) throws PrintException
 	}
 
 	@Override
-	public String read(BitSequence o) throws ReadException
+	public String read(Object ob) throws ReadException
 	{
+		if (!(ob instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence o = (BitSequence) ob;
 		byte[] bytes = BlobSchema.blob16.read(o).toByteArray();
 		return new String(bytes);
 	}

diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/StringSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/StringSchema.java
@@ -31,5 +31,5 @@ public abstract class StringSchema implements Schema
 	public abstract BitSequence print(Object o) throws PrintException;
 
 	@Override
-	public abstract String read(BitSequence s) throws ReadException;
+	public abstract String read(Object s) throws ReadException;
 }
diff --git a/Source/Buffy/src/ca/uqac/lif/azrael/buffy/VariantSchema.java b/Source/Buffy/src/ca/uqac/lif/azrael/buffy/VariantSchema.java
@@ -84,8 +84,13 @@ protected VariantSchema add(SchemaEntry e)
 	}
 
 	@Override
-	public Object read(BitSequence t) throws ReadException
+	public Object read(Object o) throws ReadException
 	{
+		if (!(o instanceof BitSequence))
+		{
+			throw new ReadException("Expected a bit sequence");
+		}
+		BitSequence t = (BitSequence) o;
 		BitSequence b_id = t.truncatePrefix(s_int.getWidth());
 		if (!m_schemaMap.containsKey(b_id))
 		{