migrated to svn revision 33108

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / expressions / EMatch.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EMatch.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EMatch.java
index a218b95c38bf04913f983ba5c0978cb169b16e34..11877a60e086e9d0e6ba16f7eac4aaaccedd8cac 100755 (executable)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EMatch.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EMatch.java
@@ -1,9 +1,5 @@
 package org.simantics.scl.compiler.elaboration.expressions;\r
 \r
-import gnu.trove.map.hash.TObjectIntHashMap;\r
-import gnu.trove.set.hash.THashSet;\r
-import gnu.trove.set.hash.TIntHashSet;\r
-\r
 import java.util.ArrayList;\r
 \r
 import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;\r
@@ -13,6 +9,7 @@ import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
 import org.simantics.scl.compiler.environment.Environment;\r
 import org.simantics.scl.compiler.errors.Locations;\r
 import org.simantics.scl.compiler.internal.codegen.references.IVal;\r
+import org.simantics.scl.compiler.internal.codegen.ssa.exits.Throw;\r
 import org.simantics.scl.compiler.internal.codegen.writer.CodeWriter;\r
 import org.simantics.scl.compiler.internal.elaboration.matching.PatternMatchingCompiler;\r
 import org.simantics.scl.compiler.internal.elaboration.matching.Row;\r
@@ -21,6 +18,10 @@ import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;\r
 import org.simantics.scl.compiler.types.kinds.Kinds;\r
 \r
+import gnu.trove.map.hash.TObjectIntHashMap;\r
+import gnu.trove.set.hash.THashSet;\r
+import gnu.trove.set.hash.TIntHashSet;\r
+\r
 public class EMatch extends Expression {\r
 \r
     public Expression[] scrutinee;\r
@@ -75,7 +76,7 @@ public class EMatch extends Expression {
            CodeWriter joinPoint = w.createBlock(getType());\r
            CodeWriter failurePoint = w.createBlock(); // TODO generate only one failurePoint per function\r
            PatternMatchingCompiler.split(w, env, scrutineeVals, joinPoint.getContinuation(), failurePoint.getContinuation(), rows);\r
-           failurePoint.throw_(location, "Matching failure at: " + toString());\r
+           failurePoint.throw_(location, Throw.MatchingException, "Matching failure at: " + toString());\r
            w.continueAs(joinPoint);\r
            return w.getParameters()[0];\r
     }\r
@@ -149,6 +150,19 @@ public class EMatch extends Expression {
         setType(requiredType);\r
         return this;\r
     }\r
+    \r
+    @Override\r
+    public Expression checkIgnoredType(TypingContext context) {\r
+        Type[] scrutineeTypes = new Type[scrutinee.length];\r
+        for(int i=0;i<scrutinee.length;++i) {\r
+            scrutinee[i] = scrutinee[i].checkType(context, Types.metaVar(Kinds.STAR));\r
+            scrutineeTypes[i] = scrutinee[i].getType();\r
+        }\r
+        for(Case case_ : cases)\r
+            case_.checkIgnoredType(context, scrutineeTypes);\r
+        setType(Types.UNIT);\r
+        return this;\r
+    }\r
 \r
     @Override\r
     public Expression decorate(ExpressionDecorator decorator) {\r