Language change: All functions and methods declared lexically outside any class are now

automatically static, and fields are no longer allowed to be declared there.  Stated
differently, all heap state must now be declared inside an explicitly declared class,
and functions and methods declared outside any class can be viewed as belonging to
the module.  The motivating benefit of this change is to no longer need the 'static'
keyword when declaring a module of functions and methods.

1 files changed, 11 insertions, 11 deletions

diff --git a/Test/dafny0/snapshots/runtest.snapshot.expect b/Test/dafny0/snapshots/runtest.snapshot.expect
index 3a0828d4..75277b8b 100644
--- a/Test/dafny0/snapshots/runtest.snapshot.expect
+++ b/Test/dafny0/snapshots/runtest.snapshot.expect
@@ -7,11 +7,11 @@ Processing command (at Snapshots0.v0.dfy(4,10)) assert Lit(false);
 

 Dafny program verifier finished with 3 verified, 0 errors

 Processing call to procedure IntraModuleCall$$_module.__default.bar in implementation Impl$$_module.__default.foo (at Snapshots0.v1.dfy(3,6)):

-  >>> added axiom: (forall call1old#AT#$Heap: Heap :: { ##extracted_function##1(call1old#AT#$Heap) } ##extracted_function##1(call1old#AT#$Heap) == (true && Lit(false) && (forall<alpha> $o: ref, $f: Field alpha :: { read($Heap, $o, $f) } $o != null && read(call1old#AT#$Heap, $o, alloc) ==> read($Heap, $o, $f) == read(call1old#AT#$Heap, $o, $f)) && $HeapSucc(call1old#AT#$Heap, $Heap)))

-  >>> added after: a##post##0 := a##post##0 && ##extracted_function##1(call1old#AT#$Heap);

+  >>> added axiom: (forall call0old#AT#$Heap: Heap :: { ##extracted_function##1(call0old#AT#$Heap) } ##extracted_function##1(call0old#AT#$Heap) == (true && Lit(false) && (forall<alpha> $o: ref, $f: Field alpha :: { read($Heap, $o, $f) } $o != null && read(call0old#AT#$Heap, $o, alloc) ==> read($Heap, $o, $f) == read(call0old#AT#$Heap, $o, $f)) && $HeapSucc(call0old#AT#$Heap, $Heap)))

+  >>> added after: a##post##0 := a##post##0 && ##extracted_function##1(call0old#AT#$Heap);

 Processing command (at Snapshots0.v1.dfy(3,6)) assert (forall<alpha> $o: ref, $f: Field alpha :: false ==> $_Frame[$o, $f]);

   >>> MarkAsFullyVerified

-Processing command (at <unknown location>) a##post##0 := a##post##0 && ##extracted_function##1(call1old#AT#$Heap);

+Processing command (at <unknown location>) a##post##0 := a##post##0 && ##extracted_function##1(call0old#AT#$Heap);

   >>> AssumeNegationOfAssumptionVariable

 Processing command (at Snapshots0.v1.dfy(4,10)) assert Lit(false);

   >>> MarkAsPartiallyVerified

@@ -49,13 +49,13 @@ Processing command (at Snapshots2.v0.dfy(3,4)) assert (forall<alpha> $o: ref, $f
   >>> DoNothingToAssert

 Processing command (at Snapshots2.v0.dfy(4,10)) assert Lit(false);

   >>> DoNothingToAssert

-Processing command (at Snapshots2.v0.dfy(11,11)) assert this == this;

+Processing command (at Snapshots2.v0.dfy(11,11)) assert true;

   >>> DoNothingToAssert

-Processing command (at Snapshots2.v0.dfy(11,15)) assert Lit(_module.__default.P($LS($LS($LZ)), $Heap, this)) <==> Lit(_module.__default.Q($LS($LS($LZ)), $Heap, this));

+Processing command (at Snapshots2.v0.dfy(11,15)) assert Lit(_module.__default.P($LS($LS($LZ)), $Heap)) <==> Lit(_module.__default.Q($LS($LS($LZ)), $Heap));

   >>> DoNothingToAssert

-Processing command (at Snapshots2.v0.dfy(14,11)) assert this == this;

+Processing command (at Snapshots2.v0.dfy(14,11)) assert true;

   >>> DoNothingToAssert

-Processing command (at Snapshots2.v0.dfy(14,15)) assert Lit(_module.__default.Q($LS($LS($LZ)), $Heap, this)) <==> Lit(_module.__default.R($Heap, this));

+Processing command (at Snapshots2.v0.dfy(14,15)) assert Lit(_module.__default.Q($LS($LS($LZ)), $Heap)) <==> Lit(_module.__default.R($Heap));

   >>> DoNothingToAssert

 Processing command (at Snapshots2.v0.dfy(18,3)) assert true;

   >>> DoNothingToAssert

@@ -72,13 +72,13 @@ Processing command (at Snapshots2.v1.dfy(4,10)) assert Lit(false);
 Snapshots2.v1.dfy(4,10): Error: assertion violation

 Execution trace:

     (0,0): anon0

-Processing command (at Snapshots2.v1.dfy(11,11)) assert this == this;

+Processing command (at Snapshots2.v1.dfy(11,11)) assert true;

   >>> MarkAsFullyVerified

-Processing command (at Snapshots2.v1.dfy(11,15)) assert Lit(_module.__default.P($LS($LS($LZ)), $Heap, this)) <==> Lit(_module.__default.Q($LS($LS($LZ)), $Heap, this));

+Processing command (at Snapshots2.v1.dfy(11,15)) assert Lit(_module.__default.P($LS($LS($LZ)), $Heap)) <==> Lit(_module.__default.Q($LS($LS($LZ)), $Heap));

   >>> DoNothingToAssert

-Processing command (at Snapshots2.v1.dfy(14,11)) assert this == this;

+Processing command (at Snapshots2.v1.dfy(14,11)) assert true;

   >>> MarkAsFullyVerified

-Processing command (at Snapshots2.v1.dfy(14,15)) assert Lit(_module.__default.Q($LS($LS($LZ)), $Heap, this)) <==> Lit(_module.__default.R($Heap, this));

+Processing command (at Snapshots2.v1.dfy(14,15)) assert Lit(_module.__default.Q($LS($LS($LZ)), $Heap)) <==> Lit(_module.__default.R($Heap));

   >>> DoNothingToAssert

 

 Dafny program verifier finished with 5 verified, 1 error