3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-15 10:26:16 +00:00

Clarified documentation of par-or tactic.

Relates to #269.
This commit is contained in:
Christoph M. Wintersteiger 2015-10-28 18:50:22 +00:00
parent ab337de101
commit cab42d2c66
4 changed files with 295 additions and 295 deletions

View file

@ -3208,7 +3208,7 @@ namespace Microsoft.Z3
} }
/// <summary> /// <summary>
/// Create a tactic that applies the given tactics in parallel. /// Create a tactic that applies the given tactics in parallel until one of them succeeds (i.e., the first that doesn't fail).
/// </summary> /// </summary>
public Tactic ParOr(params Tactic[] t) public Tactic ParOr(params Tactic[] t)
{ {

View file

@ -2563,7 +2563,7 @@ public class Context extends IDisposable
} }
/** /**
* Create a tactic that applies the given tactics in parallel. * Create a tactic that applies the given tactics in parallel until one of them succeeds (i.e., the first that doesn't fail).
**/ **/
public Tactic parOr(Tactic... t) public Tactic parOr(Tactic... t)
{ {

View file

@ -2941,7 +2941,7 @@ sig
Alias for [UsingParams]*) Alias for [UsingParams]*)
val with_ : context -> tactic -> Params.params -> tactic val with_ : context -> tactic -> Params.params -> tactic
(** Create a tactic that applies the given tactics in parallel. *) (** Create a tactic that applies the given tactics in parallel until one of them succeeds (i.e., the first that doesn't fail). *)
val par_or : context -> tactic list -> tactic val par_or : context -> tactic list -> tactic
(** Create a tactic that applies a tactic to a given goal and then another tactic (** Create a tactic that applies a tactic to a given goal and then another tactic

View file

@ -94,8 +94,8 @@ void help_tactic(cmd_context & ctx) {
std::ostringstream buf; std::ostringstream buf;
buf << "combinators:\n"; buf << "combinators:\n";
buf << "- (and-then <tactic>+) executes the given tactics sequencially.\n"; buf << "- (and-then <tactic>+) executes the given tactics sequencially.\n";
buf << "- (or-else <tactic>+) tries the given tactics in sequence until one of them succeeds.\n"; buf << "- (or-else <tactic>+) tries the given tactics in sequence until one of them succeeds (i.e., the first that doesn't fail).\n";
buf << "- (par-or <tactic>+) executes the given tactics in parallel until one of them succeeds.\n"; buf << "- (par-or <tactic>+) executes the given tactics in parallel until one of them succeeds (i.e., the first that doesn't fail).\n";
buf << "- (par-then <tactic1> <tactic2>) executes tactic1 and then tactic2 to every subgoal produced by tactic1. All subgoals are processed in parallel.\n"; buf << "- (par-then <tactic1> <tactic2>) executes tactic1 and then tactic2 to every subgoal produced by tactic1. All subgoals are processed in parallel.\n";
buf << "- (try-for <tactic> <num>) excutes the given tactic for at most <num> milliseconds, it fails if the execution takes more than <num> milliseconds.\n"; buf << "- (try-for <tactic> <num>) excutes the given tactic for at most <num> milliseconds, it fails if the execution takes more than <num> milliseconds.\n";
buf << "- (if <probe> <tactic> <tactic>) if <probe> evaluates to true, then execute the first tactic. Otherwise execute the second.\n"; buf << "- (if <probe> <tactic> <tactic>) if <probe> evaluates to true, then execute the first tactic. Otherwise execute the second.\n";