X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FEMatch.java;h=eef72f9de4f192f4ca44725a519024fb3add2bda;hp=d1a96d04a36696f214a16b626e8ba83f788ad41f;hb=862c09c9608329f326404342d12da61792eece2c;hpb=695ffae899b981f31695e5fdd30ac8fed9fe84b8

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 d1a96d04a..eef72f9de 100644
--- 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
@@ -2,11 +2,11 @@ package org.simantics.scl.compiler.elaboration.expressions;
 
 import java.util.ArrayList;
 
+import org.simantics.scl.compiler.compilation.CompilationContext;
 import org.simantics.scl.compiler.elaboration.contexts.ReplaceContext;
 import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
-import org.simantics.scl.compiler.environment.Environment;
 import org.simantics.scl.compiler.errors.Locations;
 import org.simantics.scl.compiler.internal.codegen.references.IVal;
 import org.simantics.scl.compiler.internal.codegen.ssa.exits.Throw;
@@ -64,18 +64,18 @@ public class EMatch extends Expression {
 	}
 
 	@Override
-	public IVal toVal(Environment env, CodeWriter w) {
+	public IVal toVal(CompilationContext context, CodeWriter w) {
 	    ArrayList<Row> rows = new ArrayList<Row>(cases.length);
 	    for(Case case_ : cases)
 	        rows.add(new Row(case_.patterns, case_.value));
 	    
 	    IVal[] scrutineeVals = new IVal[scrutinee.length];
 	    for(int i=0;i<scrutinee.length;++i)
-	        scrutineeVals[i] = scrutinee[i].toVal(env, w);
+	        scrutineeVals[i] = scrutinee[i].toVal(context, w);
 	    
 	    CodeWriter joinPoint = w.createBlock(getType());
 	    CodeWriter failurePoint = w.createBlock(); // TODO generate only one failurePoint per function
-	    PatternMatchingCompiler.split(w, env, scrutineeVals, joinPoint.getContinuation(), failurePoint.getContinuation(), rows);
+	    PatternMatchingCompiler.split(w, context, scrutineeVals, joinPoint.getContinuation(), failurePoint.getContinuation(), rows);
 	    failurePoint.throw_(location, Throw.MatchingException, "Matching failure at: " + toString());
 	    w.continueAs(joinPoint);
 	    return w.getParameters()[0];