X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Fcompilation%2FElaboration.java;h=26bd31ec26cb96beebcac814e8dbce8c49b05212;hb=a04614760395f09f5e9e3d38226b72f1b8e3d7ba;hp=f7f745841460bdbfc30aacbd0a35b5174620208f;hpb=4e753de3df98d5411f8329205c0e03f2e13e3c1d;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java index f7f745841..26bd31ec2 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java @@ -169,6 +169,7 @@ public class Elaboration { module = new ConcreteModule(moduleName); compilationContext.module = module; + compilationContext.moduleRepository = localEnvironmentFactory.getModuleRepository(); if(moduleHeader != null) { if(moduleHeader.defaultLocalName != null) module.setDefaultLocalName(moduleHeader.defaultLocalName); @@ -206,9 +207,9 @@ public class Elaboration { try { String absoluteModuleName = ModuleUtils.resolveAbsolutePath(moduleName, relativeImport.moduleName); ImportDeclaration absoluteImport = new ImportDeclaration( + relativeImport.location, absoluteModuleName, relativeImport.localName, relativeImport.reexport, relativeImport.spec); - absoluteImport.location = relativeImport.location; absoluteImports.add(absoluteImport); } catch (InvalidModulePathException e) { errorLog.log(relativeImport.location, e.getMessage());