ImportManager: importing module should be in cache as well

Suppose we have this situation:

* circular1.egl imports circular2.egl.
* circular2.egl imports circular1.egl.
* We load and parse circular1.egl as the root module.

In this scenario, we want circular1.egl to be in the ImportManager
cache before parsing circular2.egl, so that it will be reused when
parsing circular2.egl.

This prevents the creation of a throwaway EglModule while parsing
circular2.egl (which is not used anyway, due to the loop over the
ancestors which is done in Import::load).

Author: agarciadom

plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/ImportManager.java

@@ -24,8 +24,13 @@ public class ImportManager implements IImportManager {
 
 	@Override
 	public void loadModuleForImport(Import import_, Class<? extends IModule> moduleImplClass, URI baseURI) throws URISyntaxException {
-		String importPath = import_.getPath();
+		/*
+		 * The cache should contain the importing module as well,
+		 * to reuse modules in the presence of dependency cycles.
+		 */
+		cache.put(baseURI, import_.getParentModule());
 
+		final String importPath = import_.getPath();
 		final URI importUri = UriUtil.resolve(importPath, baseURI).normalize();
 		final IEolModule parentModule = import_.getParentModule();