X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FEMatch.java;h=4ad8135c43803367f9584fe3e3158a45f92d106a;hb=refs%2Fchanges%2F50%2F750%2F1;hp=d1a96d04a36696f214a16b626e8ba83f788ad41f;hpb=593a8f75d9dbc363234002dc500c346afbeba040;p=simantics%2Fplatform.git

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
old mode 100755
new mode 100644
index d1a96d04a..4ad8135c4
--- 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,18 +2,17 @@ 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;
 import org.simantics.scl.compiler.internal.codegen.writer.CodeWriter;
 import org.simantics.scl.compiler.internal.elaboration.matching.PatternMatchingCompiler;
 import org.simantics.scl.compiler.internal.elaboration.matching.Row;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.kinds.Kinds;
@@ -64,18 +63,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];
@@ -164,15 +163,6 @@ public class EMatch extends Expression {
         return this;
     }
 
-    @Override
-    public Expression decorate(ExpressionDecorator decorator) {
-        for(int i=0;i<scrutinee.length;++i)
-            scrutinee[i] = scrutinee[i].decorate(decorator);
-        for(Case case_ : cases)
-            case_.decorate(decorator);
-        return decorator.decorate(this);
-    }
-
     @Override
     public void collectEffects(THashSet<Type> effects) {
         for(Expression s : scrutinee)
@@ -196,14 +186,6 @@ public class EMatch extends Expression {
     public Case[] getCases() {
         return cases;
     }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        for(Expression s : scrutinee)
-            s.forVariables(procedure);
-        for(Case case_ : cases)
-            case_.forVariables(procedure);
-    }
     
     @Override
     public Expression accept(ExpressionTransformer transformer) {