X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Finternal%2Felaboration%2Fmatching%2FPatternMatchingCompiler.java;h=64bf7053b14d0526310fc0fcb4eae4fe149f2b7a;hb=refs%2Fchanges%2F34%2F1534%2F3;hp=9bf056bef825fe3a6c3db4e0cbef0fed1572c6eb;hpb=cb5fc8d606d8b322563e9345c441eecfa7f01753;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/matching/PatternMatchingCompiler.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/matching/PatternMatchingCompiler.java index 9bf056bef..64bf7053b 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/matching/PatternMatchingCompiler.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/matching/PatternMatchingCompiler.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import org.simantics.scl.compiler.common.exceptions.InternalCompilerError; +import org.simantics.scl.compiler.compilation.CompilationContext; import org.simantics.scl.compiler.constants.Constant; import org.simantics.scl.compiler.elaboration.expressions.EApply; import org.simantics.scl.compiler.elaboration.expressions.EApplyType; @@ -16,9 +17,9 @@ import org.simantics.scl.compiler.elaboration.expressions.EVariable; import org.simantics.scl.compiler.elaboration.expressions.EViewPattern; import org.simantics.scl.compiler.elaboration.expressions.Expression; import org.simantics.scl.compiler.elaboration.expressions.GuardedExpressionGroup; +import org.simantics.scl.compiler.elaboration.java.DynamicConstructor; import org.simantics.scl.compiler.elaboration.modules.SCLValue; import org.simantics.scl.compiler.elaboration.modules.TypeConstructor; -import org.simantics.scl.compiler.environment.Environment; import org.simantics.scl.compiler.internal.codegen.continuations.Branch; import org.simantics.scl.compiler.internal.codegen.continuations.ICont; import org.simantics.scl.compiler.internal.codegen.references.IVal; @@ -54,7 +55,7 @@ public class PatternMatchingCompiler { return newVals; } - private static void splitByConstructors(CodeWriter w, final Environment env, IVal[] scrutinee, final ICont success, ICont failure, List rows, int columnId) { + private static void splitByConstructors(long location, CodeWriter w, final CompilationContext context, IVal[] scrutinee, final ICont success, ICont failure, List rows, int columnId) { THashMap matrixMap = new THashMap(); ArrayList branches = new ArrayList(); ArrayList matrices = new ArrayList(); @@ -94,7 +95,7 @@ public class PatternMatchingCompiler { if(constructor_ instanceof EConstant) { SCLValue constructor = ((EConstant)constructor_).getValue(); - ExpressionMatrix matrix = matrixMap.get(constructor.getName()); + ExpressionMatrix matrix = constructor.getValue() == DynamicConstructor.INSTANCE ? null : matrixMap.get(constructor.getName()); if(matrix == null) { CodeWriter newW = w.createBlock(Types.getTypes(parameters)); branches.add(new Branch((Constant)constructor.getValue(), newW.getContinuation())); @@ -167,7 +168,7 @@ public class PatternMatchingCompiler { CodeWriter newW = w.createBlock(); ICont cont = newW.getContinuation(); branches.add(new Branch(null, cont)); - split(newW, env, scrutinee, success, failure, rows.subList(i, rows.size())); + split(location, newW, context, scrutinee, success, failure, rows.subList(i, rows.size())); failure = cont; } else { @@ -177,7 +178,7 @@ public class PatternMatchingCompiler { } catch (MatchException e) { throw new InternalCompilerError(); } - TypeConstructor cons = (TypeConstructor)env.getTypeDescriptor(con); + TypeConstructor cons = (TypeConstructor)context.environment.getTypeDescriptor(con); int maxBranchCount = cons.isOpen ? Integer.MAX_VALUE : cons.constructors.length; if(branches.size() < maxBranchCount) @@ -185,11 +186,11 @@ public class PatternMatchingCompiler { } for(ExpressionMatrix mx : matrices) - split(mx.w, env, mx.scrutinee, success, failure, mx.rows); - w.switch_(scrutinee[columnId], branches.toArray(new Branch[branches.size()])); + split(location, mx.w, context, mx.scrutinee, success, failure, mx.rows); + w.switch_(location, scrutinee[columnId], branches.toArray(new Branch[branches.size()])); } - private static void splitByViewPattern(CodeWriter w, Environment env, IVal[] scrutinee, ICont success, + private static void splitByViewPattern(long location, CodeWriter w, CompilationContext context, IVal[] scrutinee, ICont success, ICont failure, List rows, int viewPatternColumn) { Row firstRow = rows.get(0); EViewPattern firstViewPattern = (EViewPattern)firstRow.patterns[viewPatternColumn]; @@ -221,19 +222,19 @@ public class PatternMatchingCompiler { IVal[] newScrutinee = Arrays.copyOf(scrutinee, scrutinee.length); newScrutinee[viewPatternColumn] = w.apply(firstViewPattern.location, - firstViewPattern.expression.toVal(env, w), + firstViewPattern.expression.toVal(context, w), scrutinee[viewPatternColumn]); if(i == rows.size()) { - split(w, env, newScrutinee, success, failure, rows); + split(location, w, context, newScrutinee, success, failure, rows); } else { CodeWriter cont = w.createBlock(); - split(w, env, newScrutinee, success, cont.getContinuation(), rows.subList(0, i)); - split(cont, env, scrutinee, success, failure, rows.subList(i, rows.size())); + split(location, w, context, newScrutinee, success, cont.getContinuation(), rows.subList(0, i)); + split(location, cont, context, scrutinee, success, failure, rows.subList(i, rows.size())); } } - public static void split(CodeWriter w, Environment env, IVal[] scrutinee, ICont success, ICont failure, List rows) { + public static void split(long location, CodeWriter w, CompilationContext context, IVal[] scrutinee, ICont success, ICont failure, List rows) { Row firstRow = rows.get(0); Expression[] patterns = firstRow.patterns; if(scrutinee.length != patterns.length) @@ -248,13 +249,13 @@ public class PatternMatchingCompiler { viewPatternColumn = i; } else if(!(pattern instanceof EVariable)) { - splitByConstructors(w, env, scrutinee, success, failure, rows, i); + splitByConstructors(location, w, context, scrutinee, success, failure, rows, i); return; } } if(viewPatternColumn >= 0) { - splitByViewPattern(w, env, scrutinee, success, failure, rows, viewPatternColumn); + splitByViewPattern(location, w, context, scrutinee, success, failure, rows, viewPatternColumn); return; } @@ -264,16 +265,16 @@ public class PatternMatchingCompiler { if(firstRow.value instanceof GuardedExpressionGroup) { GuardedExpressionGroup group = (GuardedExpressionGroup)firstRow.value; if(rows.size() == 1) { - group.compile(env, w, success, failure); + group.compile(context, w, success, failure); } else { CodeWriter newW = w.createBlock(); ICont cont = newW.getContinuation(); - group.compile(env, w, success, cont); - split(newW, env, scrutinee, success, failure, rows.subList(1, rows.size())); + group.compile(context, w, success, cont); + split(location, newW, context, scrutinee, success, failure, rows.subList(1, rows.size())); } } else - w.jump(success, firstRow.value.toVal(env, w)); + w.jump(location, success, firstRow.value.toVal(context, w)); } }