Fix issue #55 and #64. When performing type argument substitution for function

F's corresponding F_FULL, make sure the function is indeed the FullVesion
before the substitution. Also keep the TypeArgsSubst for the enclosingClass in
the typeMap.

2 files changed, 16 insertions, 0 deletions

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

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

+

+predicate {:opaque} G(f:int->bool)

+  reads f.reads;

+  requires f.requires(0);

+{

+  true

+}

+

+predicate A<T>(s:set<T>)

+

+predicate{:opaque} B(s:set<int>)

+    requires A(s);

diff --git a/Test/dafny4/Bug55.dfy.expect b/Test/dafny4/Bug55.dfy.expect
new file mode 100644
index 00000000..790f6509
--- /dev/null
+++ b/Test/dafny4/Bug55.dfy.expect
@@ -0,0 +1,2 @@
+

+Dafny program verifier finished with 5 verified, 0 errors