diff options
| author |  Clément Pit--Claudel <clement.pitclaudel@live.com> | 2015-08-21 19:10:54 -0700 |
|---|---|---|
| committer | Clément Pit--Claudel <clement.pitclaudel@live.com> | 2015-08-21 19:10:54 -0700 |
| commit | a7d63787addef715ba8b77d3adf9455c8c174c48 (patch) | |
| tree | 168b73c7366465e4a794b6c7982fc6b9c38167e6 | |
| parent | 0551c469ca003176417255f19a9574312a7e7a0f (diff) | |
Rephrase the message about triggers being rejected because they are too strong
| -rw-r--r-- | Source/Dafny/Triggers/QuantifiersCollection.cs | 2 | ||||
| -rw-r--r-- | Test/triggers/useless-triggers-are-removed.dfy.expect | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/Dafny/Triggers/QuantifiersCollection.cs b/Source/Dafny/Triggers/QuantifiersCollection.cs index 8e4c3261..1d5625cd 100644 --- a/Source/Dafny/Triggers/QuantifiersCollection.cs +++ b/Source/Dafny/Triggers/QuantifiersCollection.cs @@ -137,7 +137,7 @@ namespace Microsoft.Dafny.Triggers { (candidate, weakerCandidates) => !weakerCandidates.Any(),
(candidate, weakerCandidates) => {
q.RejectedCandidates.Add(candidate);
- candidate.Annotation = "stronger than " + String.Join(", ", weakerCandidates);
+ candidate.Annotation = "more specific than " + String.Join(", ", weakerCandidates);
}).ToList();
}
}
diff --git a/Test/triggers/useless-triggers-are-removed.dfy.expect b/Test/triggers/useless-triggers-are-removed.dfy.expect index 6c2c0a2b..a526e517 100644 --- a/Test/triggers/useless-triggers-are-removed.dfy.expect +++ b/Test/triggers/useless-triggers-are-removed.dfy.expect @@ -1,17 +1,17 @@ useless-triggers-are-removed.dfy(16,11): Info: Selected triggers: {f(x)}
Rejected triggers:
- {h(g(f(x)))} (stronger than {g(f(x))}, {f(x)})
- {g(h(f(x)))} (stronger than {h(f(x))}, {f(x)})
- {h(f(x))} (stronger than {f(x)})
- {g(f(x))} (stronger than {f(x)})
+ {h(g(f(x)))} (more specific than {g(f(x))}, {f(x)})
+ {g(h(f(x)))} (more specific than {h(f(x))}, {f(x)})
+ {h(f(x))} (more specific than {f(x)})
+ {g(f(x))} (more specific than {f(x)})
useless-triggers-are-removed.dfy(20,11): Info: Selected triggers: {f(f(x))}
Rejected triggers: {f(x)} (loops with {f(f(x))})
useless-triggers-are-removed.dfy(23,11): Info: Selected triggers:
{g(f(x)), g(y)}, {f(y), f(x)}
Rejected triggers:
{g(y), f(x)} (loops with {g(f(y))}, {g(f(x))})
- {g(f(x)), g(f(y))} (stronger than {g(f(x)), f(y)}, {g(f(y)), f(x)}, {f(y), f(x)})
- {g(f(x)), f(y)} (stronger than {f(y), f(x)})
- {g(f(y)), f(x)} (stronger than {f(y), f(x)})
+ {g(f(x)), g(f(y))} (more specific than {g(f(x)), f(y)}, {g(f(y)), f(x)}, {f(y), f(x)})
+ {g(f(x)), f(y)} (more specific than {f(y), f(x)})
+ {g(f(y)), f(x)} (more specific than {f(y), f(x)})
Dafny program verifier finished with 5 verified, 0 errors
|