add type calculators for simple first order operations

epsilonlabs · Jan 16, 2025 · 16d6a02 · 16d6a02
1 parent efb2f11
commit 16d6a02
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 0 deletions.
diff --git a/...ine/src/org/eclipse/epsilon/eol/execute/operations/declarative/BooleanTypeCalculator.java b/...ine/src/org/eclipse/epsilon/eol/execute/operations/declarative/BooleanTypeCalculator.java
@@ -0,0 +1,14 @@
+package org.eclipse.epsilon.eol.execute.operations.declarative;
+
+import org.eclipse.epsilon.eol.execute.operations.ITypeCalculator;
+import org.eclipse.epsilon.eol.staticanalyser.types.EolPrimitiveType;
+import org.eclipse.epsilon.eol.staticanalyser.types.EolType;
+
+public class BooleanTypeCalculator implements ITypeCalculator {
+
+	@Override
+	public EolType calculateType(EolType contextType, EolType iteratorType, EolType expressionType) {
+		return EolPrimitiveType.Boolean;
+	}
+
+}
diff --git a/...eol.engine/src/org/eclipse/epsilon/eol/execute/operations/declarative/CountOperation.java b/...eol.engine/src/org/eclipse/epsilon/eol/execute/operations/declarative/CountOperation.java
@@ -15,6 +15,7 @@
 import org.eclipse.epsilon.eol.dom.Parameter;
 import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
 import org.eclipse.epsilon.eol.execute.context.IEolContext;
+import org.eclipse.epsilon.eol.execute.operations.TypeCalculator;
 import org.eclipse.epsilon.eol.function.CheckedEolPredicate;
 
 /**
@@ -23,6 +24,7 @@
  * @author Sina Madani
  * @since 1.6
  */
+@TypeCalculator(klass = IntegerTypeCalculator.class)
 public class CountOperation extends FirstOrderOperation {
 
 	@Override

diff --git a/...ol.engine/src/org/eclipse/epsilon/eol/execute/operations/declarative/ExistsOperation.java b/...ol.engine/src/org/eclipse/epsilon/eol/execute/operations/declarative/ExistsOperation.java
@@ -16,7 +16,9 @@
 import org.eclipse.epsilon.eol.dom.Parameter;
 import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
 import org.eclipse.epsilon.eol.execute.context.IEolContext;
+import org.eclipse.epsilon.eol.execute.operations.TypeCalculator;
 
+@TypeCalculator(klass = BooleanTypeCalculator.class)
 public class ExistsOperation extends SelectBasedOperation {
 
 	@Override

diff --git a/...ol.engine/src/org/eclipse/epsilon/eol/execute/operations/declarative/ForAllOperation.java b/...ol.engine/src/org/eclipse/epsilon/eol/execute/operations/declarative/ForAllOperation.java
@@ -17,7 +17,9 @@
 import org.eclipse.epsilon.eol.dom.Parameter;
 import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
 import org.eclipse.epsilon.eol.execute.context.IEolContext;
+import org.eclipse.epsilon.eol.execute.operations.TypeCalculator;
 
+@TypeCalculator(klass = BooleanTypeCalculator.class)
 public class ForAllOperation extends SelectBasedOperation {
 
 	@Override

diff --git a/...ine/src/org/eclipse/epsilon/eol/execute/operations/declarative/IntegerTypeCalculator.java b/...ine/src/org/eclipse/epsilon/eol/execute/operations/declarative/IntegerTypeCalculator.java
@@ -0,0 +1,14 @@
+package org.eclipse.epsilon.eol.execute.operations.declarative;
+
+import org.eclipse.epsilon.eol.execute.operations.ITypeCalculator;
+import org.eclipse.epsilon.eol.staticanalyser.types.EolPrimitiveType;
+import org.eclipse.epsilon.eol.staticanalyser.types.EolType;
+
+public class IntegerTypeCalculator implements ITypeCalculator {
+
+	@Override
+	public EolType calculateType(EolType contextType, EolType iteratorType, EolType expressionType) {
+		return EolPrimitiveType.Integer;
+	}
+
+}
diff --git a/...ol.engine/src/org/eclipse/epsilon/eol/execute/operations/declarative/NMatchOperation.java b/...ol.engine/src/org/eclipse/epsilon/eol/execute/operations/declarative/NMatchOperation.java
@@ -17,6 +17,7 @@
 import org.eclipse.epsilon.eol.exceptions.EolIllegalOperationParametersException;
 import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
 import org.eclipse.epsilon.eol.execute.context.IEolContext;
+import org.eclipse.epsilon.eol.execute.operations.TypeCalculator;
 import org.eclipse.epsilon.eol.function.CheckedEolPredicate;
 
 /**
@@ -27,6 +28,7 @@
  * @author Sina Madani
  * @since 1.6
  */
+@TypeCalculator(klass = BooleanTypeCalculator.class)
 public class NMatchOperation extends FirstOrderOperation {
 
 	/**

diff --git a/...s/src/org/eclipse/epsilon/eol/staticanalyser/tests/scripts/simpleFirstOrderOperations.eol b/...s/src/org/eclipse/epsilon/eol/staticanalyser/tests/scripts/simpleFirstOrderOperations.eol
@@ -0,0 +1,9 @@
+/*Boolean*/Sequence{0..9}.atLeastNMatch(i:Integer | i < 5, 1);
+/*Boolean*/Sequence{0..9}.atMostNMatch(i:Integer | i < 5, 1);
+/*Boolean*/Sequence{0..9}.nMatch(i:Integer | i < 5, 1);
+/*Boolean*/Sequence{0..9}.exists(i:Integer | i < 5);
+/*Boolean*/Sequence{0..9}.forAll(i:Integer | i < 5);
+/*Boolean*/Sequence{0..9}.none(i:Integer | i < 5);
+/*Boolean*/Sequence{0..9}.one(i:Integer | i < 5);
+/*Integer*/Sequence{0..9}.count(i:Integer | i < 5);
+