From 6b69b54a9e316dd53b602d69dde3b44eb131a1cf Mon Sep 17 00:00:00 2001 From: Rustan Leino Date: Thu, 4 Oct 2012 00:41:44 -0700 Subject: Dafny: fixed merge --- Binaries/DafnyPrelude.bpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Binaries') diff --git a/Binaries/DafnyPrelude.bpl b/Binaries/DafnyPrelude.bpl index fafc9484..342b72c1 100644 --- a/Binaries/DafnyPrelude.bpl +++ b/Binaries/DafnyPrelude.bpl @@ -615,22 +615,22 @@ procedure $YieldHavoc(this: ref, rds: Set BoxType, nw: Set BoxType); read($Heap, $o, $f) == read(old($Heap), $o, $f)); ensures $HeapSucc(old($Heap), $Heap); -// havoc everything in $Heap, except rds-mod-{this} -procedure $IterHavoc0(this: ref, rds: Set BoxType, mod: Set BoxType); +// havoc everything in $Heap, except rds-modi-{this} +procedure $IterHavoc0(this: ref, rds: Set BoxType, modi: Set BoxType); modifies $Heap; ensures (forall $o: ref, $f: Field alpha :: { read($Heap, $o, $f) } $o != null && read(old($Heap), $o, alloc) ==> - rds[$Box($o)] && !mod[$Box($o)] && $o != this ==> + rds[$Box($o)] && !modi[$Box($o)] && $o != this ==> read($Heap, $o, $f) == read(old($Heap), $o, $f)); ensures $HeapSucc(old($Heap), $Heap); -// havoc $Heap at {this}+mod+nw -procedure $IterHavoc1(this: ref, mod: Set BoxType, nw: Set BoxType); +// havoc $Heap at {this}+modi+nw +procedure $IterHavoc1(this: ref, modi: Set BoxType, nw: Set BoxType); modifies $Heap; ensures (forall $o: ref, $f: Field alpha :: { read($Heap, $o, $f) } $o != null && read(old($Heap), $o, alloc) ==> read($Heap, $o, $f) == read(old($Heap), $o, $f) || - $o == this || mod[$Box($o)] || nw[$Box($o)]); + $o == this || modi[$Box($o)] || nw[$Box($o)]); ensures $HeapSucc(old($Heap), $Heap); procedure $IterCollectNewObjects(prevHeap: HeapType, newHeap: HeapType, this: ref, NW: Field (Set BoxType)) -- cgit v1.2.3