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

collectors.

1 files changed, 7 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));

     }