(refs #7250) Merging master, minor CHR bugfixes

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / chr / CHRRelation.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRelation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRelation.java
index af6e5a2d51229ae9ce6768a0528aa7365e70f13f..7369d496c95530b0726f2a3333a17bafb9c8ba54 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRelation.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRelation.java
@@ -1,13 +1,15 @@
-package org.simantics.scl.compiler.elaboration.chr;\r
-\r
-import org.simantics.scl.compiler.types.TVar;\r
-import org.simantics.scl.compiler.types.Type;\r
-import org.simantics.scl.compiler.types.Types;\r
-import org.simantics.scl.compiler.types.kinds.Kinds;\r
-\r
-public interface CHRRelation {\r
-    public static final TVar A = Types.var(Kinds.STAR);\r
-    \r
-    TVar[] getTypeVariables();\r
-    Type[] getParameterTypes();\r
-}\r
+package org.simantics.scl.compiler.elaboration.chr;
+
+import org.simantics.scl.compiler.types.TPred;
+import org.simantics.scl.compiler.types.TVar;
+import org.simantics.scl.compiler.types.Type;
+import org.simantics.scl.compiler.types.Types;
+import org.simantics.scl.compiler.types.kinds.Kinds;
+
+public interface CHRRelation {
+    public static final TVar A = Types.var(Kinds.STAR);
+    
+    TVar[] getTypeVariables();
+    Type[] getParameterTypes();
+    TPred[] getTypeConstraints();
+}