strengthened type checking

cleaned up the generation of mover checks (based on example from Chris)
added two examples from Chris to regressions

1 files changed, 10 insertions, 2 deletions

diff --git a/Test/og/parallel2.bpl b/Test/og/parallel2.bpl
index ad40ffa0..c28edf2b 100644
--- a/Test/og/parallel2.bpl
+++ b/Test/og/parallel2.bpl
@@ -8,7 +8,12 @@ function {:inline} {:linear "tid"} TidCollector(x: int) : [int]bool
   MapConstBool(false)[x := true]

 }

 

-procedure {:yields} {:layer 1} Allocate() returns ({:linear "tid"} xls: int);

+procedure {:yields} {:layer 1} Allocate() returns ({:linear "tid"} tid: int)

+{

+    yield;

+    call tid := AllocateLow();

+    yield;

+}

 

 procedure {:yields} {:layer 0,1} Write(idx: int, val: int);

 ensures {:atomic} |{A: a[idx] := val; return true; }|;

@@ -48,4 +53,7 @@ ensures {:layer 1} old(a)[i] == a[i];
 {

     yield;

     assert {:layer 1} old(a)[i] == a[i];

-}
\ No newline at end of file
+}

+

+procedure {:yields} {:layer 0,1} AllocateLow() returns ({:linear "tid"} tid: int);

+ensures {:atomic} |{ A: return true; }|;