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%2Fchr%2FCHRRuleset.java;fp=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fchr%2FCHRRuleset.java;h=aa59d4c0239159b604d396be91710fb66d69cfda;hp=55bbcfe34f9c245968083ab39e374b9814fc8908;hb=91682baa9a8252390f09b80fd724f47e5957b234;hpb=3826e289058a51d09310b7ba1251e959dc0ed3d0 diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRuleset.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRuleset.java index 55bbcfe34..aa59d4c02 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRuleset.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRuleset.java @@ -257,7 +257,7 @@ public class CHRRuleset extends Symbol { PlanRealizer realizer = new PlanRealizer(cachedContext, this, runtimeRulesetVariable, implementationParameters[0], plan.ops); realizer.nextOp(methodWriter); if(methodWriter.isUnfinished()) - methodWriter.return_(BooleanConstant.TRUE); + methodWriter.return_(rule.location, BooleanConstant.TRUE); } } if(!includes.isEmpty() || extensible) { @@ -273,7 +273,7 @@ public class CHRRuleset extends Symbol { methodWriter.apply(Locations.NO_LOCATION, new JavaMethod(true, runtimeRulesetClassName, "register", Types.PROC, Types.UNIT, new Type[] {runtimeRulesetType, Types.CHRContext}), object.getTarget(), methodWriter.getParameters()[0]); - methodWriter.return_(NoRepConstant.UNIT); + methodWriter.return_(location, NoRepConstant.UNIT); } { CodeWriter methodWriter = object.createMethod(w.getModuleWriter(), TVar.EMPTY_ARRAY, Types.PROC, Types.UNIT, new Type[] {Types.CHRContext}); @@ -287,7 +287,7 @@ public class CHRRuleset extends Symbol { methodWriter.apply(Locations.NO_LOCATION, new JavaMethod(true, runtimeRulesetClassName, "unregister", Types.PROC, Types.UNIT, new Type[] {runtimeRulesetType, Types.CHRContext}), object.getTarget(), methodWriter.getParameters()[0]); - methodWriter.return_(NoRepConstant.UNIT); + methodWriter.return_(location, NoRepConstant.UNIT); } } if(initConstraint != null) {