Merge

8 files changed, 81 insertions, 6 deletions

diff --git a/Test/dafny0/NonGhostQuantifiers.dfy.expect b/Test/dafny0/NonGhostQuantifiers.dfy.expect
index 6b737add..0abf0b6c 100644
--- a/Test/dafny0/NonGhostQuantifiers.dfy.expect
+++ b/Test/dafny0/NonGhostQuantifiers.dfy.expect
@@ -11,11 +11,7 @@ NonGhostQuantifiers.dfy(16,5): Error: quantifiers in non-ghost contexts must be
 NonGhostQuantifiers.dfy(45,4): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'n'

 NonGhostQuantifiers.dfy(49,4): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'd'

 NonGhostQuantifiers.dfy(53,4): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'n'

-NonGhostQuantifiers.dfy(77,5): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'

-NonGhostQuantifiers.dfy(81,5): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'j'

-NonGhostQuantifiers.dfy(91,5): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'j'

-NonGhostQuantifiers.dfy(106,5): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'j'

 NonGhostQuantifiers.dfy(114,10): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'

 NonGhostQuantifiers.dfy(123,8): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'x'

 NonGhostQuantifiers.dfy(140,8): Error: Assignment to non-ghost variable is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)

-20 resolution/type errors detected in NonGhostQuantifiers.dfy

+16 resolution/type errors detected in NonGhostQuantifiers.dfy

diff --git a/Test/dafny4/Bug104.dfy b/Test/dafny4/Bug104.dfy
new file mode 100644
index 00000000..ffabbb92
--- /dev/null
+++ b/Test/dafny4/Bug104.dfy
@@ -0,0 +1,12 @@
+// RUN: %dafny /compile:0 "%s" > "%t"

+// RUN: %diff "%s.expect" "%t"

+

+datatype PartRealPartGhost = PartRealPartGhost(x:int, ghost y:int) 

+

+method UpdateField() 

+{

+ var v := PartRealPartGhost(3, 4);

+ ghost var g := 5;

+ v := v[y := g];

+ v := v.(y := g);

+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug104.dfy.expect b/Test/dafny4/Bug104.dfy.expect
new file mode 100644
index 00000000..1cc43cbf
--- /dev/null
+++ b/Test/dafny4/Bug104.dfy.expect
@@ -0,0 +1,3 @@
+Bug104.dfy(10,7): Warning: datatype update syntax D[f := E] is deprecated; the new syntax is D.(f := E)

+

+Dafny program verifier finished with 2 verified, 0 errors

diff --git a/Test/dafny4/Bug89.dfy b/Test/dafny4/Bug89.dfy
new file mode 100644
index 00000000..12aec5f4
--- /dev/null
+++ b/Test/dafny4/Bug89.dfy
@@ -0,0 +1,15 @@
+// RUN: %dafny  /compile:3 "%s" > "%t"

+// RUN: %diff "%s.expect" "%t"

+

+method F() returns(x:int)

+  ensures x == 6;

+{

+  x := 5;

+  x := (var y := 1; y + x);

+}

+

+method Main()

+{

+  var x := F();

+  print x;

+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug89.dfy.expect b/Test/dafny4/Bug89.dfy.expect
new file mode 100644
index 00000000..5221a5d1
--- /dev/null
+++ b/Test/dafny4/Bug89.dfy.expect
@@ -0,0 +1,6 @@
+

+Dafny program verifier finished with 4 verified, 0 errors

+Program compiled successfully

+Running...

+

+6
\ No newline at end of file
diff --git a/Test/dafny4/Bug91.dfy b/Test/dafny4/Bug91.dfy
new file mode 100644
index 00000000..53e5d5b2
--- /dev/null
+++ b/Test/dafny4/Bug91.dfy
@@ -0,0 +1,40 @@
+// RUN: %dafny /compile:0  "%s" > "%t"

+// RUN: %diff "%s.expect" "%t"

+

+type SendState = map<int, seq<int>>

+

+function UnAckedMessages(s:SendState) : set<int>

+{

+    set m,dst | dst in s && m in s[dst] :: m

+}

+

+function UnAckedMessagesForDst(s:SendState, dst:int) : set<int>

+    requires dst in s;

+{

+    set m | m in s[dst] :: m

+}

+

+function UnAckedMessages3(s:SendState) : set<int>

+{

+    set m,dst | dst in s && m in UnAckedMessagesForDst(s, dst) :: m

+}

+

+function SeqToSet<T>(s:seq<T>) : set<T>

+{

+    set i | i in s 

+}

+

+function UnAckedMessages4(s:SendState) : set<int>

+{

+		set m,dst | dst in s && m in SeqToSet(s[dst]) :: m

+}

+

+function UnAckedLists(s:SendState) : set<seq<int>>

+{

+    set dst | dst in s :: s[dst]

+}

+

+function UnAckedMessages5(s:SendState) : set<int>

+{

+    set m, list | list in UnAckedLists(s) && m in list :: m

+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug91.dfy.expect b/Test/dafny4/Bug91.dfy.expect
new file mode 100644
index 00000000..76f19e0d
--- /dev/null
+++ b/Test/dafny4/Bug91.dfy.expect
@@ -0,0 +1,2 @@
+

+Dafny program verifier finished with 7 verified, 0 errors

diff --git a/Test/pydiff.py b/Test/pydiff.py
index 407fe251..94267960 100644
--- a/Test/pydiff.py
+++ b/Test/pydiff.py
@@ -75,7 +75,8 @@ def preProcess(openFile, stripTrailingCR=False, ignoreAllSpace=False):
     # newline characters because this will create a mess when outputting the
     # diff. Is this the right behaviour?
     deleteChars=' \t'
-    translationTable = str.maketrans('','', deleteChars)
+    if sys.version_info.major  >= 3:
+        translationTable = str.maketrans('','', deleteChars)
 
     copy = [ ]
     for line in original: