X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Ftypes%2FTypes.java;h=f793754eed215be13e6ead654b115dac722b5df2;hb=3c2807a26920491016a1887d2c1a95609c082a19;hp=e6454fc0c22fcc6561fbe82cb6f96dc651b21b3c;hpb=43ddca759254b8e38029c1041d91cbdd7890c9b5;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java index e6454fc0c..f793754ee 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java @@ -98,9 +98,7 @@ public class Types { public static final TCon ORDERED_RING = con("Prelude", "OrderedRing"); public static final TCon REAL = con("Prelude", "Real"); public static final TCon SHOW = con("Prelude", "Show"); - public static final TCon EQ = con("Prelude", "Eq"); public static final TCon ORD = con("Prelude", "Ord"); - public static final TCon HASHABLE = con("Prelude", "Hashable"); public static final TCon IO = con("Serialization", "IO"); public static final Type REF = con("Prelude", "Ref"); @@ -1017,6 +1015,15 @@ public class Types { return result; } + public static TPred[] replace(TPred[] types, TVar[] from, Type[] to) { + if(types.length == 0) + return TPred.EMPTY_ARRAY; + TPred[] result = new TPred[types.length]; + for(int i=0;i Type[] replace(Type[] types, THashMap map) { if(types.length == 0) return Type.EMPTY_ARRAY; @@ -1034,6 +1041,10 @@ public class Types { else return new TUnion(effects); } + + public static Type union(Type effect1, Type effect2) { + return new TUnion(effect1, effect2); + } public static Type union(List effects) { if(effects.size() == 0)