Merge 182452a into 1996deb

build.gradle

@@ -11,7 +11,7 @@ targetCompatibility = 1.8
 
 group = "org.manifold"
 // name = "manifold-core"
-version = '0.10.0-SNAPSHOT'
+version = '0.11.0-SNAPSHOT'
 
 jar {
   manifest {

src/main/java/org/manifold/compiler/Attributes.java

@@ -9,6 +9,18 @@
 public class Attributes {
   private final Map<String, Value> data;
 
+  @Override
+  public boolean equals(Object aThat) {
+    if (this == aThat) {
+      return true;
+    }
+    if (!(aThat instanceof Attributes)) {
+      return false;
+    }
+    Attributes that = (Attributes) aThat;
+    return (this.getAll().equals(that.getAll()));
+  }
+
   public Attributes(Map<String, Value> data) {
     this.data = ImmutableMap.copyOf(data);
   }

src/main/java/org/manifold/compiler/InferredTypeValue.java

@@ -25,6 +25,15 @@ public String toString() {
     return "Inferred(" + elementType + ")";
   }
 
+  @Override
+  public boolean isSubtypeOf(TypeValue other) {
+    if (!(other instanceof InferredTypeValue)) {
+      return false;
+    }
+    InferredTypeValue otherType = (InferredTypeValue) other;
+    return (this.getInferredType().isSubtypeOf(otherType.getInferredType()));
+  }
+
   @Override
   public Value instantiate(JsonElement element) {
     if (element.isJsonNull()) {