move static analyser package into eol.engine plugin.

resolve circular import and related errors

plugins/org.eclipse.epsilon.ecl.staticanalyser/META-INF/MANIFEST.MF

@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.epsilon.ecl.staticanalyser
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.eclipse.epsilon.ecl.staticanalysis
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.epsilon.eol.staticanalyser,
+Require-Bundle: org.eclipse.epsilon.eol.engine,
  org.eclipse.epsilon.ecl.engine
 Export-Package: org.eclipse.epsilon.ecl.staticanalyser

plugins/org.eclipse.epsilon.ecl.staticanalyser/src/org/eclipse/epsilon/ecl/staticanalyser/EclStaticAnalyser.java

@@ -12,9 +12,7 @@
 import org.eclipse.epsilon.eol.dom.Expression;
 import org.eclipse.epsilon.eol.dom.StatementBlock;
 import org.eclipse.epsilon.eol.execute.context.FrameType;
-import org.eclipse.epsilon.eol.execute.context.Variable;
 import org.eclipse.epsilon.eol.staticanalyser.EolStaticAnalyser;
-import org.eclipse.epsilon.eol.types.EolPrimitiveType;
 import org.eclipse.epsilon.erl.dom.Post;
 import org.eclipse.epsilon.erl.dom.Pre;
 

plugins/org.eclipse.epsilon.eol.engine/META-INF/MANIFEST.MF

@@ -6,8 +6,7 @@ Bundle-SymbolicName: org.eclipse.epsilon.eol.engine;singleton:=true
 Bundle-Version: 2.6.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.epsilon.common;visibility:=reexport,
- org.eclipse.epsilon.eol.staticanalyser;bundle-version="2.6.0"
+Require-Bundle: org.eclipse.epsilon.common;visibility:=reexport
 Export-Package: org.eclipse.epsilon.eol,
  org.eclipse.epsilon.eol.concurrent,
  org.eclipse.epsilon.eol.debug,
@@ -39,6 +38,9 @@ Export-Package: org.eclipse.epsilon.eol,
  org.eclipse.epsilon.eol.models.java,
  org.eclipse.epsilon.eol.models.transactions,
  org.eclipse.epsilon.eol.parse,
+ org.eclipse.epsilon.eol.staticanalyser,
+ org.eclipse.epsilon.eol.staticanalyser.execute.context,
+ org.eclipse.epsilon.eol.staticanalyser.types,
  org.eclipse.epsilon.eol.tools,
  org.eclipse.epsilon.eol.types,
  org.eclipse.epsilon.eol.types.concurrent,

plugins/org.eclipse.epsilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java → plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java

@@ -10,7 +10,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.eclipse.epsilon.common.dt.editor.AbstractModuleEditor;
 import org.eclipse.epsilon.common.module.AbstractModuleElement;
 import org.eclipse.epsilon.common.module.IModule;
 import org.eclipse.epsilon.common.module.IModuleValidator;
@@ -127,25 +126,11 @@ public class EolStaticAnalyser implements IModuleValidator, IEolVisitor {
 	// parameters
 	HashMap<OperationCallExpression, ArrayList<EolType>> matchedReturnType = new HashMap<>(); // keeping returnTypes of
 																								// matched operations
-	HashMap<OperationCallExpression, Boolean> matched = new HashMap<>(); // finding one perfect match, in doesn't change
-																			// for every missmatch
-
-	public static void main(String[] args) throws Exception {
-
-		EolModule module = new EolModule();
-		module.parse("(1 or true).println();");
-		IModelFactory modelFactory = new StaticModelFactory();
-		EolStaticAnalyser analyser = new EolStaticAnalyser(modelFactory);
-		List<ModuleMarker> markers = analyser.validate(module);
-		for (ModuleMarker marker : markers) {
-			System.out.println(marker.getMessage());
-		}
-	}
+	HashMap<OperationCallExpression, Boolean> matched = new HashMap<>(); // finding one perfect match, in doesn't change																		// for every missmatch
 
 	public EolStaticAnalyser() {
-		this(new StaticModelFactory());
 	}
-
+	
 	public EolStaticAnalyser(IModelFactory modelFactory) {
 		context.modelFactory = modelFactory;
 	}
@@ -1296,7 +1281,7 @@ public List<ModuleMarker> validate(IModule imodule) {
 
 	@Override
 	public String getMarkerType() {
-		return AbstractModuleEditor.PROBLEM_MARKER;
+		return ModuleMarker.Severity.Error.name();
 	}
 
 	public void createTypeCompatibilityWarning(Expression requiredExpression, Expression providedExpression) {

plugins/org.eclipse.epsilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/types/EolNativeType.java → plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/staticanalyser/types/EolNativeType.java

@@ -27,6 +27,7 @@ public List<EolType> getParentTypes() {
 		if (javaClass == Object.class) {
 			return Collections.emptyList();
 		}else {
+			//TODO Also support Interfaces
 			return Arrays.asList(new EolNativeType(javaClass.getSuperclass()));
 		}
 	}

plugins/org.eclipse.epsilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/types/EolType.java → plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/staticanalyser/types/EolType.java

@@ -11,7 +11,7 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -67,7 +67,7 @@ public Set<EolType> getAncestors() {
 		if (ancestorCache != null) {
 			return ancestorCache;
 		}
-		Set<EolType> ancestors = new HashSet<EolType>();
+		Set<EolType> ancestors = new LinkedHashSet<EolType>();
 
 		Stack<EolType> stack = new Stack<EolType>();
 		stack.push(this);

plugins/org.eclipse.epsilon.etl.staticanalyser/META-INF/MANIFEST.MF

@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.epsilon.etl.staticanalyser;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.eclipse.epsilon.etl.staticanalyser
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.epsilon.eol.staticanalyser,
+Require-Bundle: org.eclipse.epsilon.eol.engine,
  org.eclipse.epsilon.etl.engine,
  org.eclipse.epsilon.emc.emf,
  org.eclipse.epsilon.common.dt

plugins/org.eclipse.epsilon.etl.staticanalyser/src/org/eclipse/epsilon/etl/staticanalyser/EtlStaticAnalyser.java

@@ -4,19 +4,17 @@
 import java.util.List;
 
 import org.eclipse.epsilon.common.module.IModule;
-import org.eclipse.epsilon.common.module.IModuleValidator;
 import org.eclipse.epsilon.common.module.ModuleMarker;
 import org.eclipse.epsilon.eol.dom.ExecutableBlock;
 import org.eclipse.epsilon.eol.dom.Expression;
 import org.eclipse.epsilon.eol.dom.StatementBlock;
 import org.eclipse.epsilon.eol.execute.context.FrameType;
-import org.eclipse.epsilon.eol.execute.context.Variable;
+import org.eclipse.epsilon.eol.staticanalyser.execute.context.Variable;
 import org.eclipse.epsilon.eol.staticanalyser.EolStaticAnalyser;
-import org.eclipse.epsilon.eol.types.EolPrimitiveType;
+import org.eclipse.epsilon.eol.staticanalyser.types.EolPrimitiveType;
 import org.eclipse.epsilon.erl.dom.Post;
 import org.eclipse.epsilon.erl.dom.Pre;
 import org.eclipse.epsilon.etl.EtlModule;
-import org.eclipse.epsilon.etl.IEtlModule;
 import org.eclipse.epsilon.etl.dom.IEtlVisitor;
 import org.eclipse.epsilon.etl.dom.TransformationRule;
 

plugins/org.eclipse.epsilon.evl.staticanalyser/src/org/eclipse/epsilon/evl/staticanalyser/EvlStaticAnalyser.java

@@ -5,7 +5,7 @@
 
 import org.eclipse.epsilon.common.module.IModule;
 import org.eclipse.epsilon.common.module.ModuleMarker;
-import org.eclipse.epsilon.eol.execute.context.Variable;
+import org.eclipse.epsilon.eol.staticanalyser.execute.context.Variable;
 import org.eclipse.epsilon.eol.staticanalyser.EolStaticAnalyser;
 import org.eclipse.epsilon.erl.dom.Post;
 import org.eclipse.epsilon.erl.dom.Pre;

plugins/org.eclipse.epsilon.examples.staticanalyser/META-INF/MANIFEST.MF

@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.eclipse.epsilon.examples.staticanalyser
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.epsilon.eol.engine,
- org.eclipse.epsilon.eol.staticanalyser,
  org.eclipse.epsilon.emc.emf,
  org.eclipse.epsilon.etl.staticanalyser,
  org.eclipse.epsilon.etl.engine,

plugins/org.eclipse.epsilon.examples.staticanalyser/src/org/eclipse/epsilon/examples/staticanalyser/ecl/EclPreExecuteConfiguration.java

@@ -3,7 +3,7 @@
 import org.eclipse.epsilon.ecl.launch.EclRunConfiguration;
 import org.eclipse.epsilon.ecl.staticanalyser.EclStaticAnalyser;
 import org.eclipse.epsilon.eol.IEolModule;
-import org.eclipse.epsilon.eol.staticanalyser.SubEmfModelFactory;
+import org.eclipse.epsilon.examples.staticanalyser.eol.SubEmfModelFactory;
 
 public class EclPreExecuteConfiguration extends EclRunConfiguration {
 	IEolModule module;

plugins/pom.xml

@@ -78,7 +78,6 @@
     <module>org.eclipse.epsilon.eol.dt.interpreter</module>
     <module>org.eclipse.epsilon.eol.dap</module>
     <module>org.eclipse.epsilon.eol.engine</module>
-    <module>org.eclipse.epsilon.eol.staticanalyser</module>
     <module>org.eclipse.epsilon.eol.tools</module>
     <module>org.eclipse.epsilon.epl.dt</module>
     <module>org.eclipse.epsilon.epl.engine</module>

tests/org.eclipse.epsilon.eol.staticanalyser.tests/META-INF/MANIFEST.MF

@@ -7,7 +7,5 @@ Export-Package: org.eclipse.epsilon.eol.staticanalyser.tests
 Automatic-Module-Name: org.eclipse.epsilon.eol.staticanalyser.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.epsilon.eol.engine,
- org.eclipse.epsilon.eol.staticanalyser,
  org.junit,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi;bundle-version="2.16.0"
+ org.eclipse.epsilon.emc.emf

tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/EolStaticAnalyserTests.java

@@ -16,7 +16,6 @@
 import org.eclipse.epsilon.common.module.ModuleMarker.Severity;
 import org.eclipse.epsilon.eol.EolModule;
 import org.eclipse.epsilon.eol.staticanalyser.EolStaticAnalyser;
-import org.eclipse.epsilon.eol.staticanalyser.StaticModelFactory;
 import org.eclipse.epsilon.eol.staticanalyser.types.EolType;
 import org.junit.BeforeClass;
 import org.junit.Test;

tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/EolStaticAnalyserTestsBacklog.java

@@ -17,7 +17,6 @@
 import org.eclipse.epsilon.common.module.ModuleMarker;
 import org.eclipse.epsilon.eol.EolModule;
 import org.eclipse.epsilon.eol.staticanalyser.EolStaticAnalyser;
-import org.eclipse.epsilon.eol.staticanalyser.StaticModelFactory;
 import org.eclipse.epsilon.eol.types.EolType;
 import org.junit.BeforeClass;
 import org.junit.Ignore;

plugins/org.eclipse.epsilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/StaticModelFactory.java → tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/StaticModelFactory.java

@@ -1,7 +1,8 @@
-package org.eclipse.epsilon.eol.staticanalyser;
+package org.eclipse.epsilon.eol.staticanalyser.tests;
 
 import org.eclipse.epsilon.emc.emf.EmfModel;
 import org.eclipse.epsilon.eol.models.IModel;
+import org.eclipse.epsilon.eol.staticanalyser.IModelFactory;
 
 public class StaticModelFactory implements IModelFactory {
 

tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/scripts/IntegerOperationContributor.eol

@@ -0,0 +1,15 @@
+/*Native<java.lang.Number>*/1.abs();
+/*Integer*/1.ceiling();
+/*Integer*/1.floor();
+/*Real*/1.log();
+/*Real*/1.log10();
+/*Native<java.lang.Number>*/1.max(2);
+/*Native<java.lang.Number>*/1.min(2);
+/*Native<java.lang.Number>*/1.pow(2);
+/*Integer*/1.round();
+
+/*Sequence<Integer>*/1.iota(10, 1);
+/*Integer*/1.mod(2);
+/*Sequence<Integer>*/1.to(10);
+/*String*/1.toBinary();
+/*String*/1.toHex();