migrated to svn revision 33108

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/GuardedExpressionGroup.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/GuardedExpressionGroup.java
index 9bec115127b2a0d5a8a32c5edc0f552743eb463a..48f72eeac0b1a3f743fb0a042eb5c78b32e54619 100755 (executable)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/GuardedExpressionGroup.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/GuardedExpressionGroup.java
@@ -1,10 +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 org.simantics.scl.compiler.common.exceptions.InternalCompilerError;\r
 import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;\r
 import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;\r
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;\r
@@ -13,12 +8,17 @@ import org.simantics.scl.compiler.environment.Environment;
 import org.simantics.scl.compiler.errors.Locations;\r
 import org.simantics.scl.compiler.internal.codegen.continuations.ICont;\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.utils.ExpressionDecorator;\r
 import org.simantics.scl.compiler.types.Type;\r
 import org.simantics.scl.compiler.types.Types;\r
 import org.simantics.scl.compiler.types.exceptions.MatchException;\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 GuardedExpressionGroup extends Expression {\r
     public GuardedExpression[] expressions;\r
 \r
@@ -58,7 +58,7 @@ public class GuardedExpressionGroup extends Expression {
         CodeWriter failure = w.createBlock();\r
         compile(env, w, success.getContinuation(), failure.getContinuation());\r
         w.continueAs(success);\r
-        failure.throw_(location, "Matching failure at: " + toString());\r
+        failure.throw_(location, Throw.MatchingException, "Matching failure at: " + toString());\r
         return result;\r
         //throw new InternalCompilerError("GuardedExpressionGroup should be handled in match compilation.");\r
     }\r