Merge branch 'ncb/development' into development

Author: idhugoid

core/interpreter/src/main/java/org/overture/interpreter/values/FunctionValue.java

@@ -50,6 +50,7 @@
 import org.overture.ast.patterns.APatternTypePair;
 import org.overture.ast.patterns.PPattern;
 import org.overture.ast.types.AFunctionType;
+import org.overture.ast.types.ANamedInvariantType;
 import org.overture.ast.types.PType;
 import org.overture.ast.util.Utils;
 import org.overture.config.Settings;
@@ -804,15 +805,23 @@ protected Value convertValueTo(PType to, Context ctxt, Set<PType> done)
 					List<PType> domain = tc.narrowest(type.getParameters(), restrictedType.getParameters());
 					PType range = tc.narrowest(type.getResult(), restrictedType.getResult());
 					AFunctionType newType = AstFactory.newAFunctionType(location, true, domain, range);
-					
+
 					// Create a new function with the narrowest domain/range.
 					FunctionValue restricted = new FunctionValue(location, name,
 						newType, paramPatternList, body, precondition, postcondition,
 						freeVariables, checkInvariants, curriedArgs, measureName,
 						measureValues, result);
 
 					restricted.typeValues = typeValues;
-					return restricted;
+
+					if (to instanceof ANamedInvariantType)
+					{
+						return new InvariantValue((ANamedInvariantType)to, restricted, ctxt);
+					}
+					else
+					{
+						return restricted;
+					}
 				}
 			}
 		}

core/typechecker/src/main/java/org/overture/typechecker/utilities/pattern/AllDefinitionLocator.java

@@ -200,7 +200,7 @@ public List<PDefinition> caseARecordPattern(ARecordPattern pattern,
 
 		ARecordInvariantType pattype = af.createPTypeAssistant().getRecord(type, pattern.getLocation().getModule());
 
-		if (!af.createPTypeAssistant().isType(question.ptype, pattype.getClass()))
+		if (!af.getTypeComparator().compatible(pattype, question.ptype))
 		{
 			TypeCheckerErrors.report(3201, "Matching expression is not a compatible record type", pattern.getLocation(), pattern);
 			TypeCheckerErrors.detail2("Pattern type", type, "Expression type", question.ptype);