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%2Finternal%2Fcodegen%2Fssa%2Fexits%2FJump.java;h=eb1a3dea972dc61f05914b4c18e13015b37adf63;hp=b0340f89db04e6b359457805b2b96c081e0b406d;hb=7e3061cfff1ac4f100fd671feccea25841222cb0;hpb=a8758de5bc19e5adb3f618d3038743a164f09912

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/ssa/exits/Jump.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/ssa/exits/Jump.java
index b0340f89d..eb1a3dea9 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/ssa/exits/Jump.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/ssa/exits/Jump.java
@@ -1,149 +1,155 @@
-package org.simantics.scl.compiler.internal.codegen.ssa.exits;
-
-import java.util.ArrayList;
-
-import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
-import org.simantics.scl.compiler.internal.codegen.continuations.Cont;
-import org.simantics.scl.compiler.internal.codegen.continuations.ContRef;
-import org.simantics.scl.compiler.internal.codegen.references.Val;
-import org.simantics.scl.compiler.internal.codegen.references.ValRef;
-import org.simantics.scl.compiler.internal.codegen.ssa.SSABlock;
-import org.simantics.scl.compiler.internal.codegen.ssa.SSAExit;
-import org.simantics.scl.compiler.internal.codegen.ssa.SSAFunction;
-import org.simantics.scl.compiler.internal.codegen.ssa.binders.ValRefBinder;
-import org.simantics.scl.compiler.internal.codegen.utils.CopyContext;
-import org.simantics.scl.compiler.internal.codegen.utils.MethodBuilder;
-import org.simantics.scl.compiler.internal.codegen.utils.PrintingContext;
-import org.simantics.scl.compiler.internal.codegen.utils.SSAValidationContext;
-import org.simantics.scl.compiler.internal.codegen.utils.ValRefVisitor;
-import org.simantics.scl.compiler.types.TVar;
-import org.simantics.scl.compiler.types.Type;
-
-public class Jump extends SSAExit implements ValRefBinder {
-    private ContRef target;
-    private ValRef[] parameters;
-    
-    public Jump(ContRef target, ValRef ... parameters) {
-        setTarget(target);
-        setParameters(parameters);
-    }
-    
-    public ContRef getTarget() {
-        return target;
-    }
-    
-    public void setTarget(ContRef target) {
-        this.target = target;
-        target.setParent(this);
-    }
-    
-    public ValRef[] getParameters() {
-        return parameters;
-    }
-    
-    public void setParameters(ValRef[] parameters) {
-        this.parameters = parameters;
-        for(ValRef parameter : parameters)
-            parameter.setParent(this);
-    }
-
-    @Override
-    public void generateCode(MethodBuilder mb) {        
-        mb.jump(target, ValRef.getBindings(parameters));
-    }
-
-    @Override
-    public void toString(PrintingContext context) {
-        context.append(target);
-        for(ValRef parameter : parameters) {
-            context.append(' ');
-            context.append(parameter);
-        }
-        context.append('\n');
-        for(SSABlock block : getSuccessors())
-            context.addBlock(block);
-        
-    }
-
-    @Override
-    public void validate(SSAValidationContext context) {
-        context.validate(target);
-        if(target.getParent() != this)
-            throw new InternalCompilerError();
-        for(ValRef parameter : parameters) {
-            context.validate(parameter);
-            if(parameter.getParent() != this)
-                throw new InternalCompilerError();
-        }
-        
-        Cont cont = target.getBinding();
-        context.assertEquals(cont.getArity(), parameters.length);
-        //for(int i=0;i<parameters.length;++i)
-        //    context.assertSubsumes(parameters[i].getType(), cont.getParameterType(i));
-    }    
-    
-    @Override
-    public void destroy() {
-        target.remove();
-        for(ValRef parameter : parameters)
-            parameter.remove();
-    }
-
-    @Override
-    public SSAExit copy(CopyContext context) {
-        return new Jump(context.copy(target), context.copy(parameters));
-    }
-    
-    @Override
-    public void replace(TVar[] vars, Type[] replacements) {
-        for(ValRef parameter : parameters)
-            parameter.replace(vars, replacements);
-    }
-
-    @Override
-    public void collectFreeVariables(SSAFunction function,
-            ArrayList<ValRef> vars) {
-        for(ValRef parameter : parameters)
-            parameter.collectFreeVariables(function, vars);        
-    }
-
-    @Override
-    public Cont addParametersInFrontOf(ContRef contRef, Val[] newParameters, Val[] oldParameters, Cont proxy) {
-        ValRef[] occurences = ValRef.createOccurrences(newParameters);
-        for(ValRef ref : occurences)
-            ref.setParent(this);
-        this.parameters = ValRef.concat(occurences, this.parameters);
-        return proxy;
-    }
-
-    public void setParameter(int position, ValRef parameter) {
-        parameters[position] = parameter;
-        parameter.setParent(this);
-    }
-
-    public ValRef getParameter(int position) {
-        return parameters[position];
-    }
-    
-    @Override
-    public boolean isJump(Cont cont, Val parameter) {        
-        return target.getBinding() == cont && 
-                parameters.length == 1 && 
-                parameters[0].getBinding() == parameter;
-    }
-
-    @Override
-    public SSABlock[] getSuccessors() {
-        Cont cont = target.getBinding();
-        if(cont instanceof SSABlock)
-            return new SSABlock[] {(SSABlock)cont};
-        else
-            return SSABlock.EMPTY_ARRAY;
-    }
-
-    @Override
-    public void forValRefs(ValRefVisitor visitor) {
-        for(ValRef parameter : parameters)
-            visitor.visit(parameter);
-    }
-}
+package org.simantics.scl.compiler.internal.codegen.ssa.exits;
+
+import java.util.ArrayList;
+
+import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
+import org.simantics.scl.compiler.internal.codegen.continuations.Cont;
+import org.simantics.scl.compiler.internal.codegen.continuations.ContRef;
+import org.simantics.scl.compiler.internal.codegen.references.Val;
+import org.simantics.scl.compiler.internal.codegen.references.ValRef;
+import org.simantics.scl.compiler.internal.codegen.ssa.SSABlock;
+import org.simantics.scl.compiler.internal.codegen.ssa.SSAExit;
+import org.simantics.scl.compiler.internal.codegen.ssa.SSAFunction;
+import org.simantics.scl.compiler.internal.codegen.ssa.binders.ValRefBinder;
+import org.simantics.scl.compiler.internal.codegen.utils.CopyContext;
+import org.simantics.scl.compiler.internal.codegen.utils.MethodBuilder;
+import org.simantics.scl.compiler.internal.codegen.utils.PrintingContext;
+import org.simantics.scl.compiler.internal.codegen.utils.SSAValidationContext;
+import org.simantics.scl.compiler.internal.codegen.utils.ValRefVisitor;
+import org.simantics.scl.compiler.types.TVar;
+import org.simantics.scl.compiler.types.Type;
+
+public class Jump extends SSAExit implements ValRefBinder {
+    private ContRef target;
+    private ValRef[] parameters;
+    
+    public Jump(ContRef target, ValRef ... parameters) {
+        setTarget(target);
+        setParameters(parameters);
+    }
+    
+    public ContRef getTarget() {
+        return target;
+    }
+    
+    public void setTarget(ContRef target) {
+        this.target = target;
+        target.setParent(this);
+    }
+    
+    public ValRef[] getParameters() {
+        return parameters;
+    }
+    
+    public void setParameters(ValRef[] parameters) {
+        this.parameters = parameters;
+        for(ValRef parameter : parameters)
+            parameter.setParent(this);
+    }
+
+    @Override
+    public void generateCode(MethodBuilder mb) {        
+        mb.jump(target, ValRef.getBindings(parameters));
+    }
+
+    @Override
+    public void toString(PrintingContext context) {
+        context.append(target);
+        for(ValRef parameter : parameters) {
+            context.append(' ');
+            context.append(parameter);
+        }
+        context.append('\n');
+        for(SSABlock block : getSuccessors())
+            context.addBlock(block);
+        
+    }
+
+    @Override
+    public void validate(SSAValidationContext context) {
+        context.validate(target);
+        if(target.getParent() != this)
+            throw new InternalCompilerError();
+        for(ValRef parameter : parameters) {
+            context.validate(parameter);
+            if(parameter.getParent() != this)
+                throw new InternalCompilerError();
+        }
+        
+        Cont cont = target.getBinding();
+        context.assertEquals(cont.getArity(), parameters.length);
+        //for(int i=0;i<parameters.length;++i)
+        //    context.assertSubsumes(parameters[i].getType(), cont.getParameterType(i));
+    }    
+    
+    @Override
+    public void destroy() {
+        target.remove();
+        for(ValRef parameter : parameters)
+            parameter.remove();
+    }
+
+    @Override
+    public SSAExit copy(CopyContext context) {
+        return new Jump(context.copy(target), context.copy(parameters));
+    }
+    
+    @Override
+    public void replace(TVar[] vars, Type[] replacements) {
+        for(ValRef parameter : parameters)
+            parameter.replace(vars, replacements);
+    }
+
+    @Override
+    public void collectFreeVariables(SSAFunction function,
+            ArrayList<ValRef> vars) {
+        for(ValRef parameter : parameters)
+            parameter.collectFreeVariables(function, vars);        
+    }
+
+    @Override
+    public Cont addParametersInFrontOf(ContRef contRef, Val[] newParameters, Val[] oldParameters, Cont proxy) {
+        ValRef[] occurences = ValRef.createOccurrences(newParameters);
+        for(ValRef ref : occurences)
+            ref.setParent(this);
+        this.parameters = ValRef.concat(occurences, this.parameters);
+        return proxy;
+    }
+
+    public void setParameter(int position, ValRef parameter) {
+        parameters[position] = parameter;
+        parameter.setParent(this);
+    }
+
+    public ValRef getParameter(int position) {
+        return parameters[position];
+    }
+    
+    @Override
+    public boolean isJump(Cont cont, Val parameter) {        
+        return target.getBinding() == cont && 
+                parameters.length == 1 && 
+                parameters[0].getBinding() == parameter;
+    }
+
+    @Override
+    public SSABlock[] getSuccessors() {
+        Cont cont = target.getBinding();
+        if(cont instanceof SSABlock)
+            return new SSABlock[] {(SSABlock)cont};
+        else
+            return SSABlock.EMPTY_ARRAY;
+    }
+
+    @Override
+    public void forValRefs(ValRefVisitor visitor) {
+        for(ValRef parameter : parameters)
+            visitor.visit(parameter);
+    }
+
+    @Override
+    public void cleanup() {
+        for(ValRef parameter : parameters)
+            parameter.remove();
+    }
+}