Fix issue 114. Do not export private terms for ComprehensionExpr in trigger

collectors.

3 files changed, 24 insertions, 0 deletions

diff --git a/Source/Dafny/Triggers/TriggersCollector.cs b/Source/Dafny/Triggers/TriggersCollector.cs
index 698ea3b5..f96d3e4c 100644
--- a/Source/Dafny/Triggers/TriggersCollector.cs
+++ b/Source/Dafny/Triggers/TriggersCollector.cs
@@ -209,6 +209,8 @@ namespace Microsoft.Dafny.Triggers {
         annotation = AnnotateIdentifier((IdentifierExpr)expr);

       } else if (expr is ApplySuffix) {

         annotation = AnnotateApplySuffix((ApplySuffix)expr);

+      } else if (expr is ComprehensionExpr) {

+        annotation = AnnotateComprehensionExpr((ComprehensionExpr)expr);

       } else if (expr is ConcreteSyntaxExpression ||

                  expr is LiteralExpr ||

                  expr is OldExpr ||

@@ -272,6 +274,11 @@ namespace Microsoft.Dafny.Triggers {
       return new TriggerAnnotation(false, Enumerable.Repeat(expr.Var, 1), null);

     }

 

+    private TriggerAnnotation AnnotateComprehensionExpr(ComprehensionExpr expr) {

+      var terms = CollectExportedCandidates(expr);

+      return new TriggerAnnotation(true, CollectVariables(expr), terms,  OnlyPrivateCandidates(terms, expr.BoundVars));

+    }

+

     private TriggerAnnotation AnnotateOther(Expression expr, bool isTriggerKiller) {

       return new TriggerAnnotation(isTriggerKiller || CollectIsKiller(expr), CollectVariables(expr), CollectExportedCandidates(expr));

     }

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

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

+

+function f1(d:int):map<int,int>

+function f2(y:int, d:int):int

+

+method M(m:map<int,int>, d:int, x2:int)

+{

+  assert forall d :: f1(d) == (map x | x in m ::  f2(x, d));

+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug114.dfy.expect b/Test/dafny4/Bug114.dfy.expect
new file mode 100644
index 00000000..8e671f90
--- /dev/null
+++ b/Test/dafny4/Bug114.dfy.expect
@@ -0,0 +1,7 @@
+Bug114.dfy(9,9): Error: assertion violation

+Execution trace:

+    (0,0): anon0

+    (0,0): anon3_Then

+    (0,0): anon2

+

+Dafny program verifier finished with 3 verified, 1 error