X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Fcompilation%2FNamespaceOfModule.java;h=8621283b73dc5e12bb7a1c5473d36cc438518567;hb=84b211a0aa05c956d33e038a1106bb0464ce373a;hp=c010835e9dc1383081033c8c28da0408dfef7f7f;hpb=a8758de5bc19e5adb3f618d3038743a164f09912;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/NamespaceOfModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/NamespaceOfModule.java index c010835e9..8621283b7 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/NamespaceOfModule.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/NamespaceOfModule.java @@ -3,9 +3,9 @@ package org.simantics.scl.compiler.compilation; import java.util.Arrays; import java.util.function.Consumer; +import org.simantics.scl.compiler.elaboration.chr.CHRRuleset; import org.simantics.scl.compiler.elaboration.modules.SCLValue; import org.simantics.scl.compiler.elaboration.modules.TypeClass; -import org.simantics.scl.compiler.elaboration.modules.TypeConstructor; import org.simantics.scl.compiler.elaboration.modules.TypeDescriptor; import org.simantics.scl.compiler.elaboration.relations.SCLEntityType; import org.simantics.scl.compiler.elaboration.relations.SCLRelation; @@ -64,7 +64,7 @@ public class NamespaceOfModule implements Namespace { return base.getValue(name); } } - + @Override public SCLRelation getRelation(String name) throws AmbiguousNameException { SCLRelation relation = module.getRelation(name); @@ -73,6 +73,14 @@ public class NamespaceOfModule implements Namespace { return base.getRelation(name); } + @Override + public CHRRuleset getRuleset(String name) throws AmbiguousNameException { + CHRRuleset ruleset = module.getRuleset(name); + if(ruleset != null) + return ruleset; + return base.getRuleset(name); + } + @Override public SCLEntityType getEntityType(String name) throws AmbiguousNameException {