X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Ftypes%2FTypes.java;h=5512f5e6e10fedf946b6d10dc421e48490256c93;hb=c13c4179bda758e77fe1f2032d3c4268bb9e3120;hp=1a6bdc257a5ce6d2f995eaa0e0a42609c56d04fe;hpb=82a87b8535628d47d9c381e1a3a2296fb67c7fd0;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 1a6bdc257..5512f5e6e 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
@@ -84,6 +84,7 @@ public class Types {
     public static final TCon TYPEABLE = con(BUILTIN, "Typeable");
     public static final TCon SERIALIZABLE = con(BUILTIN, "Serializable");
     public static final TCon VEC_COMP = con(BUILTIN, "VecComp");
+    public static final TCon CLASS = con(BUILTIN, "Class");
     public static final TCon BINDING = con(BUILTIN, "Binding");
 
     public static final TCon TYPE = con(BUILTIN, "Type");
@@ -1050,6 +1051,10 @@ public class Types {
     public static Type union(Type effect1, Type effect2) {
         return new TUnion(effect1, effect2);
     }
+    
+    public static Type union(Type effect1, Type effect2, Type effect3) {
+        return new TUnion(effect1, effect2, effect3);
+    }
 
     public static Type union(List<Type> effects) {
         if(effects.size() == 0)
@@ -1120,17 +1125,9 @@ public class Types {
         return parseType(new TypeElaborationContext(environment), text);
     }
 
-    public static Type parseType(ITypeEnvironment environment, THashMap<String, TVar> localTypeVars, String text) throws SCLTypeParseException {
-        return parseType(new TypeElaborationContext(localTypeVars, environment), text);
-    }
-
     public static Type parseType(String text) throws SCLTypeParseException {
         return parseType(new TypeElaborationContext(DUMMY_TYPE_ENVIRONMENT), text);
     }
-
-    public static Type parseType(THashMap<String, TVar> localTypeVars, String text) throws SCLTypeParseException {
-        return parseType(new TypeElaborationContext(localTypeVars, DUMMY_TYPE_ENVIRONMENT), text);
-    }
     
     private static Type parseType(TypeElaborationContext context, String text) throws SCLTypeParseException {
         SCLParserImpl parser = new SCLParserImpl(new StringReader(text));