Merge remote-tracking branch 'kindlich/development' into development

CodeModel/src/main/java/org/openzen/zenscript/codemodel/FunctionHeader.java

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel;
 
-import java.util.Arrays;
-import java.util.Map;
+import java.util.*;
+
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
@@ -532,4 +532,43 @@ public class FunctionHeader {
 	public boolean accepts(int arguments) {
 		return arguments >= this.minParameters && arguments <= this.maxParameters;
 	}
+    
+    @Override
+    public boolean equals(Object o) {
+        if(this == o)
+            return true;
+        if(o == null || getClass() != o.getClass())
+            return false;
+        
+        FunctionHeader that = (FunctionHeader) o;
+        
+        if(minParameters != that.minParameters)
+            return false;
+        if(maxParameters != that.maxParameters)
+            return false;
+        if(hasUnknowns != that.hasUnknowns)
+            return false;
+        if(!Arrays.equals(typeParameters, that.typeParameters))
+            return false;
+        if(!returnType.equals(that.returnType))
+            return false;
+        if(!Arrays.equals(parameters, that.parameters))
+            return false;
+        if(!Objects.equals(thrownType, that.thrownType))
+            return false;
+        return Objects.equals(storage, that.storage);
+    }
+    
+    @Override
+    public int hashCode() {
+        int result = Arrays.hashCode(typeParameters);
+        result = 31 * result + returnType.hashCode();
+        result = 31 * result + Arrays.hashCode(parameters);
+        result = 31 * result + (thrownType != null ? thrownType.hashCode() : 0);
+        result = 31 * result + (storage != null ? storage.hashCode() : 0);
+        result = 31 * result + minParameters;
+        result = 31 * result + maxParameters;
+        result = 31 * result + (hasUnknowns ? 1 : 0);
+        return result;
+    }
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/generic/TypeParameter.java

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.generic;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.Taggable;
 import org.openzen.zenscript.codemodel.type.TypeID;
@@ -60,8 +60,32 @@ public class TypeParameter extends Taggable {
 		}
 		return result.toString();
 	}
-	
-	@Override
+    
+    @Override
+    public boolean equals(Object o) {
+        if(this == o)
+            return true;
+        if(o == null || getClass() != o.getClass())
+            return false;
+        
+        TypeParameter that = (TypeParameter) o;
+        
+        if(!name.equals(that.name))
+            return false;
+        if(!Objects.equals(storage, that.storage))
+            return false;
+        return bounds.equals(that.bounds);
+    }
+    
+    @Override
+    public int hashCode() {
+        int result = name.hashCode();
+        result = 31 * result + (storage != null ? storage.hashCode() : 0);
+        result = 31 * result + bounds.hashCode();
+        return result;
+    }
+    
+    @Override
 	public String toString() {
 		return name + "@" + position.toShortString();
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/FunctionalMemberRef.java

@@ -26,6 +26,8 @@ import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 
+import java.util.*;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -150,4 +152,31 @@ public class FunctionalMemberRef implements DefinitionMemberRef {
 	public Expression callStatic(CodePosition position, TypeID target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		return new CallStaticExpression(position, target, this, instancedHeader, arguments);
 	}
+    
+    @Override
+    public boolean equals(Object o) {
+        if(this == o)
+            return true;
+        if(o == null || getClass() != o.getClass())
+            return false;
+        
+        FunctionalMemberRef that = (FunctionalMemberRef) o;
+        
+        if(!target.equals(that.target))
+            return false;
+        if(!header.equals(that.header))
+            return false;
+        if(!type.equals(that.type))
+            return false;
+        return Objects.equals(mapper, that.mapper);
+    }
+    
+    @Override
+    public int hashCode() {
+        int result = target.hashCode();
+        result = 31 * result + header.hashCode();
+        result = 31 * result + type.hashCode();
+        result = 31 * result + (mapper != null ? mapper.hashCode() : 0);
+        return result;
+    }
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/GenericTypeID.java

@@ -116,7 +116,7 @@ public class GenericTypeID implements TypeID {
 			return false;
 		}
 		final GenericTypeID other = (GenericTypeID) obj;
-		return this.parameter == other.parameter;
+		return this.parameter.equals(other.parameter);
 	}
 	
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/OptionalTypeID.java

@@ -124,4 +124,9 @@ public class OptionalTypeID implements TypeID {
 	public String toString(StorageTag storage) {
 		return baseType.toString(storage) + '?';
 	}
+    
+    @Override
+    public boolean isGeneric() {
+        return baseType.isGeneric();
+    }
 }