From 18a231edf04437a0748d542d3114ed79899aa363 Mon Sep 17 00:00:00 2001
From: qunyanm <unknown>
Date: Tue, 8 Dec 2015 15:15:21 -0800
Subject: Fix issue 114. Do not export private terms for ComprehensionExpr in
 trigger collectors.

---
 Source/Dafny/Triggers/TriggersCollector.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Source')

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));
     }
-- 
cgit v1.2.3