summaryrefslogtreecommitdiff
path: root/Test/dafny1
diff options
context:
space:
mode:
authorGravatar Rustan Leino <leino@microsoft.com>2011-04-05 18:09:08 -0700
committerGravatar Rustan Leino <leino@microsoft.com>2011-04-05 18:09:08 -0700
commit17deb86f8f647808dfe38f5437c9adfb373dd7e9 (patch)
treed34141def34d979ec3650dc51641b088080dfaca /Test/dafny1
parentc382dec32aac64dfa50e999795841950e4d81fed (diff)
Dafny: don't require parentheses in syntax of "choose" statements
Diffstat (limited to 'Test/dafny1')
-rw-r--r--Test/dafny1/Celebrity.dfy10
1 files changed, 5 insertions, 5 deletions
diff --git a/Test/dafny1/Celebrity.dfy b/Test/dafny1/Celebrity.dfy
index 25e6cc5c..74512e01 100644
--- a/Test/dafny1/Celebrity.dfy
+++ b/Test/dafny1/Celebrity.dfy
@@ -22,20 +22,20 @@ method FindCelebrity1<Person>(people: set<Person>, ghost c: Person) returns (r:
ensures r == c;
{
var Q := people;
- var x := choose(Q);
+ var x := choose Q;
while (Q != {x})
//invariant Q <= people; // inv1 in Rodin's Celebrity_1, but it's not needed here
invariant IsCelebrity(c, Q); // inv2
invariant x in Q;
decreases Q;
{
- var y := choose(Q - {x});
+ var y := choose Q - {x};
if (Knows(x, y)) {
Q := Q - {x}; // remove_1
} else {
Q := Q - {y}; assert x in Q; // remove_2
}
- x := choose(Q);
+ x := choose Q;
}
r := x;
}
@@ -44,7 +44,7 @@ method FindCelebrity2<Person>(people: set<Person>, ghost c: Person) returns (r:
requires IsCelebrity(c, people);
ensures r == c;
{
- var b := choose(people);
+ var b := choose people;
var R := people - {b};
while (R != {})
invariant R <= people; // inv1
@@ -54,7 +54,7 @@ method FindCelebrity2<Person>(people: set<Person>, ghost c: Person) returns (r:
decreases R;
{
- var x := choose(R);
+ var x := choose R;
if (Knows(x, b)) {
R := R - {x};
} else {