X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fjava%2FBuiltins.java;h=e23e378efd668e6c1fbafa87c8ed26c527ea7865;hb=HEAD;hp=083c3d58f132afb00f11cb79a5b1dd1ea22ee3e3;hpb=bfff906222d6990f2e8af0294fc0840450631949;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/Builtins.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/Builtins.java index 083c3d58f..e23e378ef 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/Builtins.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/Builtins.java @@ -100,6 +100,8 @@ public class Builtins extends ConcreteModule { addEffectConstructor("Proc", new EffectConstructor(Types.PROC)); addEffectConstructor("Exception", new EffectConstructor(Types.EXCEPTION)); + addTypeAlias("Pure", TVar.EMPTY_ARRAY, Types.NO_EFFECTS); + //addTypeDescriptor("->", new StandardTypeConstructor(Kinds.STAR_TO_STAR_TO_STAR, Constants.FUNCTION)); addTypeDescriptor("[]", new StandardTypeConstructor(Types.LIST, Kinds.STAR_TO_STAR, Constants.LIST)); addTypeDescriptor("@", new StandardTypeConstructor(Types.PUNIT, Kinds.STAR, Constants.TUPLE[0])); @@ -231,7 +233,7 @@ public class Builtins extends ConcreteModule { ); block.addStatement(apply); - block.setExit(new Jump(runProcFunction.getReturnCont().createOccurrence(), + block.setExit(new Jump(-1, runProcFunction.getReturnCont().createOccurrence(), x.createOccurrence())); runProcFunction.addBlock(block);