Rename forAllCombinationsOf to forEach in Editor #37

Signed-off-by: Mārtiņš Avots <martins.avots@splitcells.net>

Author: martins-avots

projects/net.splitcells.gel.editor/src/main/java/net/splitcells/gel/editor/EditorTest.java

@@ -95,7 +95,7 @@ public void testGealInterpretation() {
                         , list(FunctionCallDesc.functionCallDescForTest(NameDesc.nameDescForTest(FOR_EACH_NAME),
                                         list(functionCallDescForTest("examiner")))
                                 ,
-                                FunctionCallDesc.functionCallDescForTest(NameDesc.nameDescForTest(FOR_ALL_COMBINATIONS_OF)
+                                FunctionCallDesc.functionCallDescForTest(NameDesc.nameDescForTest(FOR_EACH_NAME)
                                         , list(functionCallDescForTest("date"), functionCallDescForTest("shift")))
                                 , FunctionCallDesc.functionCallDescForTest(NameDesc.nameDescForTest(THEN_NAME)
                                         ,
@@ -105,7 +105,7 @@ public void testGealInterpretation() {
                         , list(FunctionCallDesc.functionCallDescForTest(NameDesc.nameDescForTest(FOR_EACH_NAME),
                                         list(functionCallDescForTest("student")))
                                 ,
-                                FunctionCallDesc.functionCallDescForTest(NameDesc.nameDescForTest(FOR_ALL_COMBINATIONS_OF)
+                                FunctionCallDesc.functionCallDescForTest(NameDesc.nameDescForTest(FOR_EACH_NAME)
                                         , list(functionCallDescForTest("date"), functionCallDescForTest("shift")))
                                 , FunctionCallDesc.functionCallDescForTest(NameDesc.nameDescForTest(THEN_NAME)
                                         ,
@@ -181,10 +181,10 @@ public void testGealParsing() {
                 
                 solution   = solution('Colloquium Plan', demands, supplies);
                 solution   .forEach(examiner)
-                           .forAllCombinationsOf(date, shift)
+                           .forEach(date, shift)
                            .then(hasSize(1));
                 solution   .forEach(student)
-                           .forAllCombinationsOf(date, shift)
+                           .forEach(date, shift)
                            .then(hasSize(1));
                 solution   .forEach(student)
                            .then(hasSize(2));
@@ -254,10 +254,10 @@ public void testInput() {
                 
                 solution   = solution('Colloquium Plan', demands, supplies);
                 solution   . forEach(examiner)
-                           . forAllCombinationsOf(date, shift)
+                           . forEach(date, shift)
                            . then(hasSize(1));
                 solution   . forEach(student)
-                           . forAllCombinationsOf(date, shift)
+                           . forEach(date, shift)
                            . then(hasSize(1));
                 solution   . forEach(student)
                            . then(hasSize(2));

projects/net.splitcells.gel.editor/src/main/java/net/splitcells/gel/editor/geal/runners/ForAllCombsCallRunner.java

@@ -33,6 +33,7 @@
 import static net.splitcells.dem.utils.NotImplementedYet.notImplementedYet;
 import static net.splitcells.gel.constraint.QueryI.query;
 import static net.splitcells.gel.constraint.type.ForAlls.FOR_ALL_COMBINATIONS_OF;
+import static net.splitcells.gel.constraint.type.ForAlls.FOR_EACH_NAME;
 import static net.splitcells.gel.editor.geal.runners.FunctionCallRun.functionCallRun;
 import static net.splitcells.gel.editor.geal.runners.FunctionCallRunnerParser.functionCallRunnerParser;
 
@@ -50,7 +51,7 @@ private static class Args {
         Query subjectVal;
     }
 
-    private static final FunctionCallRunnerParser<Args> PARSER = functionCallRunnerParser(FOR_ALL_COMBINATIONS_OF, 1
+    private static final FunctionCallRunnerParser<Args> PARSER = functionCallRunnerParser(FOR_EACH_NAME, 1
             , fcr -> {
                 val args = new Args();
                 fcr.requireArgumentMinimalCount(2);
@@ -61,7 +62,7 @@ private static class Args {
             });
 
     private boolean supports(FunctionCallDesc functionCall, Optional<Object> subject, Editor context) {
-        return functionCall.getName().getValue().equals(FOR_ALL_COMBINATIONS_OF);
+        return functionCall.getName().getValue().equals(FOR_EACH_NAME);
     }
 
     @Override

projects/net.splitcells.gel.editor/src/main/resources/html/net/splitcells/gel/editor/geal/examples/colloquium-planning.txt

@@ -12,9 +12,9 @@ supplies   = table('time slots', date, shift, roomNumber);
 supplies   . importCsvData('supplies.csv');
 
 solution   = solution('Colloquium Plan', demands, supplies);
-solution   . forAllCombinationsOf(examiner, date, shift)
+solution   . forEach(examiner, date, shift)
            . then(hasSize(1));
-solution   . forAllCombinationsOf(student, date, shift)
+solution   . forEach(student, date, shift)
            . then(hasSize(1));
 solution   . forEach(student)
            . then(hasSize(2));