[PCover] Minor correction

Correct support for choosing over lists with elements as composites
p-org · Oct 7, 2023 · 95ee194 · 95ee194
1 parent 7f27a8c
commit 95ee194
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/scheduler/Scheduler.java b/Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/scheduler/Scheduler.java
@@ -246,11 +246,17 @@ public ValueSummary getNextElementFlattener(PrimitiveVS<ValueSummary> choices) {
     return flattened;
   }
 
+  protected abstract ValueSummary getNextPrimitiveList(ListVS<? extends ValueSummary> s, Guard pc);
+
   @Override
   public ValueSummary getNextElement(ListVS<? extends ValueSummary> s, Guard pc) {
-//    PrimitiveVS<Integer> idx = getNextInteger(s.size(), pc);
-//    return s.get(idx);
-    return getNextElementFlattener(getNextElementHelper(getNextElementChoices(s, pc)));
+    if (s.getItems().size() != 0) {
+      if (!(s.getItems().get(0) instanceof PrimitiveVS)) {
+        PrimitiveVS<Integer> idx = getNextInteger(s.size(), pc);
+        return s.get(idx);
+      }
+    }
+    return getNextPrimitiveList(s, pc);
   }
 
   @Override

diff --git a/Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/scheduler/replay/ReplayScheduler.java b/Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/scheduler/replay/ReplayScheduler.java
@@ -212,7 +212,7 @@ public PrimitiveVS<Integer> getNextInteger(PrimitiveVS<Integer> bound, Guard pc)
   }
 
   @Override
-  public ValueSummary getNextElement(ListVS<? extends ValueSummary> candidates, Guard pc) {
+  public ValueSummary getNextPrimitiveList(ListVS<? extends ValueSummary> candidates, Guard pc) {
     ValueSummary res = getNextElementFlattener(schedule.getRepeatElement(choiceDepth));
     List<GuardedValue<?>> gv = ValueSummary.getGuardedValues(res);
     assert (gv.size() == 1);

diff --git a/Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/scheduler/search/SearchScheduler.java b/Src/PRuntimes/PSymRuntime/src/main/java/psym/runtime/scheduler/search/SearchScheduler.java
@@ -655,7 +655,7 @@ public PrimitiveVS<Integer> getNextInteger(PrimitiveVS<Integer> bound, Guard pc)
   }
 
   @Override
-  public ValueSummary getNextElement(ListVS<? extends ValueSummary> candidates, Guard pc) {
+  public ValueSummary getNextPrimitiveList(ListVS<? extends ValueSummary> candidates, Guard pc) {
     int depth = choiceDepth;
     PrimitiveVS<ValueSummary> res =
             getNext(