Remove mention of why3-cpulimit from provers-detection-data.conf

Instead, the call to why3-cpulimit is added in Call_provers, when requested. The arguments for why3-cpulimit are now computed depending on the command line and if the prover is interactive or not.

Remove mention of why3-cpulimit from provers-detection-data.conf
Instead, the call to why3-cpulimit is added in Call_provers, when requested. The arguments for why3-cpulimit are now computed depending on the command line and if the prover is interactive or not.
a8118e80 · Johannes Kanig · dac73b72 · a8118e80 · a8118e80 · a8118e80
Commit a8118e80 authored Mar 09, 2016 by Johannes Kanig
--- a/share/provers-detection-data.conf
+++ b/share/provers-detection-data.conf
@@ -11,10 +11,8 @@ version_ok  = "1.20.prv"
 version_ok  = "1.10.prv"
 version_ok  = "1.01"
 version_ok  = "1.00.prv"
-# %T means timelimit+1
-command = "%l/why3-cpulimit %T %m -s %e -timelimit %t %f"
-# %U means 2*timelimit+1
-command_steps = "%l/why3-cpulimit %U %m -s %e -steps-bound %S %f"
+command = "%e -timelimit %t %f"
+command_steps = "%e -steps-bound %S %f"
 driver = "drivers/alt_ergo.drv"
 editor = "altgr-ergo"

@@ -27,10 +25,8 @@ version_switch = "-version"
 version_regexp = "^\\([0-9.]+\\)$"
 version_ok  = "0.99.1"
 version_ok  = "0.95.2"
-# %T means timelimit+1
-command = "%l/why3-cpulimit %T %m -s %e -no-rm-eq-existential -timelimit %t %f"
-# %U means 2*timelimit+1
-command_steps = "%l/why3-cpulimit %U %m -s %e -no-rm-eq-existential -steps-bound %S %f"
+command = "%e -no-rm-eq-existential -timelimit %t %f"
+command_steps = "%e -no-rm-eq-existential -steps-bound %S %f"
 driver = "drivers/alt_ergo.drv"
 editor = "altgr-ergo"

@@ -47,8 +43,8 @@ version_ok  = "1.5"
 driver = "drivers/cvc4_15.drv"
 # --random-seed=42 is not needed as soon as --random-freq=0.0 by default
 # to try: --inst-when=full-last-call
-command = "%l/why3-cpulimit %T %m -s %e --tlimit-per=%t000 --lang=smt2 %f"
-command_steps = "%l/why3-cpulimit %U %m -s %e --stats --rlimit=%S --lang=smt2 %f"
+command = "%e --tlimit-per=%t000 --lang=smt2 %f"
+command_steps = "%e --stats --rlimit=%S --lang=smt2 %f"

 # CVC4 version 1.4, using SMTLIB fixed-size bitvectors
 [ATP cvc4]
@@ -63,7 +59,7 @@ driver = "drivers/cvc4_14.drv"
 # to try: --inst-when=full-last-call
 # --rlimit=%S : cvc4 1.4 DOES NOT accept -1 as argument
 # cvc4 1.4 does not print steps used in --stats anyway
-command = "%l/why3-cpulimit %T %m -s %e --tlimit-per=%t000 --lang=smt2 %f"
+command = "%e --tlimit-per=%t000 --lang=smt2 %f"

 # CVC4 version 1.4, not using SMTLIB bitvectors
 [ATP cvc4]
@@ -79,7 +75,7 @@ driver = "drivers/cvc4.drv"
 # to try: --inst-when=full-last-call
 # --rlimit=%S : cvc4 1.4 DOES NOT accept -1 as argument
 # cvc4 .14 does not print steps used in --stats anyway
-command = "%l/why3-cpulimit %T %m -s %e --tlimit-per=%t000 --lang=smt2 %f"
+command = "%e --tlimit-per=%t000 --lang=smt2 %f"


 # CVC4 version 1.0 to 1.3
@@ -97,7 +93,7 @@ version_old = "1.2"
 version_old = "1.1"
 version_old = "1.0"
 driver = "drivers/cvc4.drv"
-command = "%l/why3-cpulimit %t %m -s %e --lang=smt2 %f"
+command = "%e --lang=smt2 %f"

 # Psyche version 2.x
 [ATP psyche]
@@ -108,7 +104,7 @@ version_switch = "-version"
 version_regexp = "\\([^ \n\r]+\\)"
 version_ok  = "2.0"
 driver = "drivers/psyche.drv"
-command = "%l/why3-cpulimit %t %m -s %e -gplugin dpll_wl %f"
+command = "%e -gplugin dpll_wl %f"

 # CVC3 versions 2.4.x
 [ATP cvc3]
@@ -121,7 +117,7 @@ version_regexp = "This is CVC3 version \\([^ \n]+\\)"
 version_ok  = "2.4.1"
 version_old = "2.4"
 # the -timeout option is unreliable in CVC3 2.4.1
-command = "%l/why3-cpulimit %t %m -s %e -seed 42 %f"
+command = "%e -seed 42 %f"
 driver = "drivers/cvc3.drv"

 # CVC3 versions 2.x
@@ -134,7 +130,7 @@ version_switch = "-version"
 version_regexp = "This is CVC3 version \\([^ \n]+\\)"
 version_old = "2.2"
 version_old = "2.1"
-command = "%l/why3-cpulimit %T %m -s %e  -seed 42 -timeout %t %f"
+command = "%e  -seed 42 -timeout %t %f"
 driver = "drivers/cvc3.drv"

 [ATP yices]
@@ -148,7 +144,7 @@ version_old = "^1\.0\.3[0-7]$"
 version_old = "^1\.0\.2[5-9]$"
 version_old = "^1\.0\.2[0-4]$"
 version_old = "^1\.0\.1\.*$"
-command = "%l/why3-cpulimit %t %m -s %e"
+command = "%e"
 driver = "drivers/yices.drv"

 [ATP yices-smt2]
@@ -158,7 +154,7 @@ exec = "yices-smt2-2.3.0"
 version_switch = "--version"
 version_regexp = "^Yices \\([^ \n]+\\)$"
 version_ok = "2.3.0"
-command = "%l/why3-cpulimit %t %m -s %e"
+command = "%e"
 driver = "drivers/yices-smt2.drv"

 [ATP eprover]
@@ -176,7 +172,7 @@ version_old = "1.7"
 version_old = "1.6"
 version_old = "1.5"
 version_old = "1.4"
-command = "%l/why3-cpulimit %T %m -s %e -s -R -xAuto -tAuto --cpu-limit=%t --tstp-in %f"
+command = "%e -s -R -xAuto -tAuto --cpu-limit=%t --tstp-in %f"
 driver = "drivers/eprover.drv"

 [ATP gappa]
@@ -192,7 +188,7 @@ version_switch = "--version"
 version_regexp = "Gappa \\([^ \n]*\\)"
 version_ok = "^1\.[0-2]\..+$"
 version_old = "^0\.1[1-8]\..+$"
-command = "%l/why3-cpulimit %t %m -s %e -Eprecision=70"
+command = "%e -Eprecision=70"
 driver = "drivers/gappa.drv"

 [ATP mathsat]
@@ -202,7 +198,7 @@ exec = "mathsat-5.2.2"
 version_switch = "-version"
 version_regexp = "MathSAT5 version \\([^ \n]+\\)"
 version_ok  = "5.2.2"
-command = "%l/why3-cpulimit %t %m -s %e -input=smt2 -model -random_seed=80 %f"
+command = "%e -input=smt2 -model -random_seed=80 %f"
 driver = "drivers/mathsat.drv"

 [ATP simplify]
@@ -215,7 +211,7 @@ version_switch = "-version"
 version_regexp = "Simplify version \\([^ \n,]+\\)"
 version_old = "1.5.5"
 version_old = "1.5.4"
-command = "%l/why3-cpulimit %t %m -s %e %f"
+command = "%e %f"
 driver = "drivers/simplify.drv"

 [ATP metis]
@@ -227,7 +223,7 @@ version_ok = "2.3"
 # %U means 2*timelimit+1. Required because Metis tends to
 # react very slowly to the time limit given, hence answers
 # oscillate between Timeout and Unknown
-command = "%l/why3-cpulimit %U %m -s %e --time-limit %t %f"
+command = "%e --time-limit %t %f"
 driver = "drivers/metis.drv"

 [ATP metitarski]
@@ -239,7 +235,7 @@ version_switch = "-v"
 version_regexp = "MetiTarski \\([^ \n,]+\\)"
 version_ok = "2.4"
 version_old = "2.2"
-command = "%l/why3-cpulimit %T %m -s %e --time %t %f"
+command = "%e --time %t %f"
 driver = "drivers/metitarski.drv"

 [ATP polypaver]
@@ -249,7 +245,7 @@ exec = "polypaver-0.3"
 version_switch = "--version"
 version_regexp = "PolyPaver \\([0-9.]+\\) (c)"
 version_ok = "0.3"
-command = "%l/why3-cpulimit %T %m -s %e -d 2 -m 10 --time=%t %f"
+command = "%e -d 2 -m 10 --time=%t %f"
 driver = "drivers/polypaver.drv"

 [ATP spass]
@@ -259,7 +255,7 @@ exec = "SPASS-3.7"
 version_switch = " | grep 'SPASS V'"
 version_regexp = "SPASS V \\([^ \n\t]+\\)"
 version_ok = "3.7"
-command = "%l/why3-cpulimit %T %m -s %e -TPTP -PGiven=0 -PProblem=0 -TimeLimit=%t %f"
+command = "%e -TPTP -PGiven=0 -PProblem=0 -TimeLimit=%t %f"
 driver = "drivers/spass.drv"

 [ATP spass]
@@ -269,7 +265,7 @@ exec = "SPASS-3.8ds"
 version_switch = " | grep 'SPASS[^ \\n\\t]* V'"
 version_regexp = "SPASS[^ \n\t]* V \\([^ \n\t]+\\)"
 version_ok = "3.8ds"
-command = "%l/why3-cpulimit %T %m -s %e -Isabelle=1 -PGiven=0 -TimeLimit=%t %f"
+command = "%e -Isabelle=1 -PGiven=0 -TimeLimit=%t %f"
 driver = "drivers/spass_types.drv"

 [ATP vampire]
@@ -278,7 +274,7 @@ exec = "vampire"
 exec = "vampire-0.6"
 version_switch = "--version"
 version_regexp = "Vampire \\([0-9.]+\\)"
-command = "%l/why3-cpulimit %T %m -s %e -t %t"
+command = "%e -t %t"
 driver = "drivers/vampire.drv"
 version_ok = "0.6"

@@ -287,7 +283,7 @@ name = "Princess"
 exec = "princess"
 # version_switch = "-h"
 version_regexp = "(CASC version \\([0-9-]+\\))"
-command = "%l/why3-cpulimit %T 0 -s %e -timeout=%t %f"
+command = "%e -timeout=%t %f"
 driver = "drivers/princess.drv"
 version_ok = "2013-05-13"

@@ -297,7 +293,7 @@ exec = "beagle"
 exec = "beagle-0.4.1"
 # version_switch = "-h"
 version_regexp = "version \\([0-9.]+\\)"
-command = "%l/why3-cpulimit %t 0 -s %e %f"
+command = "%e %f"
 driver = "drivers/beagle.drv"
 version_ok = "0.4.1"

@@ -307,7 +303,7 @@ exec = "veriT"
 exec = "veriT-201410"
 version_switch = "--version"
 version_regexp = "version \\([^ \n\r]+\\)"
-command = "%l/why3-cpulimit %t %m -s %e --disable-print-success %f"
+command = "%e --disable-print-success %f"
 driver = "drivers/verit.drv"
 version_ok = "201410"

@@ -317,7 +313,7 @@ exec = "veriT"
 exec = "veriT-201310"
 version_switch = "--version"
 version_regexp = "version \\([^ \n\r]+\\)"
-command = "%l/why3-cpulimit %t %m -s %e --disable-print-success --enable-simp \
+command = "%e --disable-print-success --enable-simp \
 --enable-unit-simp --enable-simp-sym --enable-unit-subst-simp --enable-bclause %f"
 driver = "drivers/verit.drv"
 version_old = "201310"
@@ -333,8 +329,8 @@ version_regexp = "Z3 version \\([^ \n\r]+\\)"
 version_ok  = "4.4.1"
 version_ok  = "4.4.0"
 driver = "drivers/z3_440.drv"
-command = "%l/why3-cpulimit %t %m -s %e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 %f"
-command_steps = "%l/why3-cpulimit %U %m -s %e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 memory_max_alloc_count=%S %f"
+command = "%e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 %f"
+command_steps = "%e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 memory_max_alloc_count=%S %f"

 # Z3 >= 4.4.0, without BV support
 [ATP z3]
@@ -348,8 +344,8 @@ version_regexp = "Z3 version \\([^ \n\r]+\\)"
 version_ok  = "4.4.1"
 version_ok  = "4.4.0"
 driver = "drivers/z3_432.drv"
-command = "%l/why3-cpulimit %t %m -s %e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 %f"
-command_steps = "%l/why3-cpulimit %U %m -s %e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 memory_max_alloc_count=%S %f"
+command = "%e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 %f"
+command_steps = "%e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 memory_max_alloc_count=%S %f"

 # Z3 4.3.2 does not support option global option -rs anymore.
 # use settings given by "z3 -p" instead
@@ -362,8 +358,8 @@ version_regexp = "Z3 version \\([^ \n\r]+\\)"
 version_ok  = "4.4.0"
 version_ok  = "4.3.2"
 driver = "drivers/z3_432.drv"
-command = "%l/why3-cpulimit %t %m -s %e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 %f"
-command_steps = "%l/why3-cpulimit %U %m -s %e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 memory_max_alloc_count=%S %f"
+command = "%e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 %f"
+command_steps = "%e -smt2 sat.random_seed=42 nlsat.randomize=false smt.random_seed=42 memory_max_alloc_count=%S %f"

 [ATP z3]
 name = "Z3"
@@ -383,7 +379,7 @@ version_old = "4.1.2"
 version_old = "4.1.1"
 version_old = "4.0"
 driver = "drivers/z3.drv"
-command = "%l/why3-cpulimit %t %m -s %e -smt2 -rs:42 %f"
+command = "%e -smt2 -rs:42 %f"

 [ATP z3]
 name = "Z3"
@@ -398,7 +394,7 @@ version_old = "3.1"
 version_old = "3.0"
 driver = "drivers/z3.drv"
 # the -T is unreliable in Z3 3.2
-command = "%l/why3-cpulimit %t %m -s %e -smt2 -rs:42 %f"
+command = "%e -smt2 -rs:42 %f"

 [ATP z3]
 name = "Z3"
@@ -412,7 +408,7 @@ version_regexp = "Z3 version \\([^ \n\r]+\\)"
 version_old = "^2\.2.+$"
 version_old = "^2\.1[6-9]$"
 driver = "drivers/z3.drv"
-command = "%l/why3-cpulimit %t %m -s %e -smt2 -rs:42 \
+command = "%e -smt2 -rs:42 \
 PHASE_SELECTION=0 \
 RESTART_STRATEGY=0 \
 RESTART_FACTOR=1.5 \
@@ -443,7 +439,7 @@ version_regexp = "Z3 version \\([^ \n\r]+\\)"
 version_old = "^2\.1[0-5]$"
 version_old = "^2\.[0-9]$"
 version_old = "1.3"
-command = "%l/why3-cpulimit %t %m -s %e -smt %f"
+command = "%e -smt %f"
 driver = "drivers/z3_smtv1.drv"

 [ATP zenon]
@@ -455,7 +451,7 @@ version_switch = "-v"
 version_regexp = "zenon version \\([^ \n\t]+\\)"
 version_ok = "0.8.0"
 version_ok = "0.7.1"
-command = "%l/why3-cpulimit %T 0 -s %e -p0 -itptp -max-size %mM -max-time %ts %f"
+command = "%e -p0 -itptp -max-size %mM -max-time %ts %f"
 driver = "drivers/zenon.drv"

 [ATP zenon_modulo]
@@ -464,7 +460,7 @@ exec = "zenon_modulo"
 version_switch = "-v"
 version_regexp = "zenon_modulo version \\([0-9.]+\\)"
 version_ok = "0.4.1"
-command = "%l/why3-cpulimit %T 0 -s %e -p0 -itptp -max-size %mM -max-time %ts %f"
+command = "%e -p0 -itptp -max-size %mM -max-time %ts %f"
 driver = "drivers/zenon_modulo.drv"

 [ATP iprover]
@@ -474,7 +470,7 @@ exec = "iprover-0.8.1"
 version_switch = " | grep iProver"
 version_regexp = "iProver v\\([^ \n\t]+\\)"
 version_ok = "0.8.1"
-command = "%l/why3-cpulimit %T %m -s %e --fof true --out_options none \
+command = "%e --fof true --out_options none \
 --time_out_virtual %t --clausifier /usr/bin/env --clausifier_options \
 \"eprover --cnf --tstp-format \" %f"
 driver = "drivers/iprover.drv"
@@ -487,7 +483,7 @@ version_regexp = "Mathematica \\([0-9.]+\\)"
 version_ok = "9.0"
 version_ok = "8.0"
 version_ok = "7.0"
-command = "%l/why3-cpulimit %t %m -s %e -noprompt"
+command = "%e -noprompt"
 driver = "drivers/mathematica.drv"

 [ATP safeprover]
@@ -496,7 +492,7 @@ exec = "safeprover"
 version_switch = "-version"
 version_regexp = "The safe prover, version \\([^ \n\t]+\\)"
 version_ok = "0.0.0"
-command = "%l/why3-cpulimit %t %m -s %e %f"
+command = "%e %f"
 driver = "drivers/safeprover.drv"

 # Coq 8.5: do not limit memory
@@ -524,7 +520,7 @@ version_ok = "8.4pl3"
 version_ok = "8.4pl2"
 version_ok = "8.4pl1"
 version_ok = "8.4"
-command = "%l/why3-cpulimit 0 %m -s %e -R %l/coq-tactic Why3 -R %l/coq Why3 -l %f"
+command = "%e -R %l/coq-tactic Why3 -R %l/coq Why3 -l %f"
 driver = "drivers/coq.drv"
 editor = "coqide"

@@ -536,8 +532,7 @@ version_switch = "-version"
 version_regexp = "PVS Version \\([^ \n]+\\)"
 version_ok = "6.0"
 version_bad = "^[0-5]\..+$"
-# not why3-cpulimit 0 %m because 'proveit' allocates 8Gb at start-up
-command = "%l/why3-cpulimit 0 0 -s %l/why3-call-pvs %l proveit -f %f"
+command = "%l/why3-call-pvs %l proveit -f %f"
 driver = "drivers/pvs.drv"
 in_place = true
 editor = "pvs"
@@ -549,8 +544,7 @@ version_switch = "version"
 version_regexp = "Isabelle\\([0-9]+\\(-[0-9]+\\)?\\)"
 version_ok = "2016"
 version_bad = "2015"
-# not why3-cpulimit 0 %m because isabelle needs more memory at start-up
-command = "%l/why3-cpulimit 0 0 -s %e why3 -b %f"
+command = "%e why3 -b %f"
 driver = "drivers/isabelle2016.drv"
 in_place = true
 editor = "isabelle-jedit"
@@ -562,8 +556,7 @@ version_switch = "version"
 version_regexp = "Isabelle\\([0-9]+\\(-[0-9]+\\)?\\)"
 version_ok = "2015"
 version_bad = "2016"
-# not why3-cpulimit 0 %m because isabelle needs more memory at start-up
-command = "%l/why3-cpulimit 0 0 -s %e why3 -b %f"
+command = "%e why3 -b %f"
 driver = "drivers/isabelle2015.drv"
 in_place = true
 editor = "isabelle-jedit"

--- a/src/driver/call_provers.ml
+++ b/src/driver/call_provers.ml
@@ -249,10 +249,14 @@ let parse_prover_run res_parser time out ret on_timelimit limit ~printer_mapping
    pr_model  = model;
  }

-let actualcommand command limit file =
+let actualcommand command ~use_why3cpulimit limit interactive file =
  let timelimit = get_time limit in
  let memlimit  = get_mem limit in
  let steplimit = get_steps limit in
+  let utime = string_of_int (2 * timelimit + 1) in
+  let ttime = string_of_int (succ timelimit) in
+  let stime = string_of_int timelimit in
+  let smem = string_of_int memlimit in
  let arglist = Cmdline.cmdline_split command in
  let use_stdin = ref true in
  let on_timelimit = ref false in
@@ -261,9 +265,9 @@ let actualcommand command limit file =
    | "%" -> "%"
    | "f" -> use_stdin := false; file
    | "t" -> on_timelimit := true; string_of_int timelimit
-    | "T" -> string_of_int (succ timelimit)
-    | "U" -> string_of_int (2 * timelimit + 1)
-    | "m" -> string_of_int memlimit
+    | "T" -> ttime
+    | "U" -> utime
+    | "m" -> smem
    (* FIXME: libdir and datadir can be changed in the configuration file
       Should we pass them as additional arguments? Or would it be better
       to prepare the command line in a separate function? *)
@@ -275,16 +279,30 @@ let actualcommand command limit file =
  let args =
    List.map (Str.global_substitute cmd_regexp replace) arglist
  in
+  let args =
+    if use_why3cpulimit && not interactive then
+      let cpulimit_bin = Filename.concat Config.libdir "why3-cpulimit" in
+      let cpulimit_time =
+        (* for steps limit use 2 * t + 1 time *)
+        if limit.limit_steps <> None then utime
+        (* if prover implements time limit, use t + 1 *)
+        else if !on_timelimit then ttime
+        (* otherwise use t *)
+        else stime in
+       cpulimit_bin :: cpulimit_time :: smem :: "-s" :: args
+    else
+      args in
  args, !use_stdin, !on_timelimit

 let call_on_file ~command
                 ~limit
                 ~res_parser
 		 ~printer_mapping
-                 ?(cleanup=false) ?(inplace=false) ?(redirect=true) fin =
+                 ?(cleanup=false) ?(inplace=false) ?(interactive=false)
+                 ?(redirect=true) fin =

  let command, use_stdin, on_timelimit =
-    try actualcommand command limit fin
+    try actualcommand command ~use_why3cpulimit:true limit interactive fin
    with e ->
      if cleanup then Sys.remove fin;
      if inplace then Sys.rename (save fin) fin;
@@ -335,7 +353,7 @@ let call_on_file ~command

 let call_on_buffer ~command ~limit ~res_parser ~filename
 		   ~printer_mapping
-                   ?(inplace=false) buffer =
+                   ?(inplace=false) ?interactive buffer =

  let fin,cin =
    if inplace then begin
@@ -345,7 +363,8 @@ let call_on_buffer ~command ~limit ~res_parser ~filename
      Filename.open_temp_file "why_" ("_" ^ filename) in
  Buffer.output_buffer cin buffer; close_out cin;
  call_on_file ~command ~limit
-               ~res_parser ~printer_mapping ~cleanup:true ~inplace fin
+               ~res_parser ~printer_mapping ~cleanup:true
+               ~inplace ?interactive fin

 let query_call pc =
  let pid, ret = Unix.waitpid [Unix.WNOHANG] pc.pid in

--- a/src/driver/call_provers.mli
+++ b/src/driver/call_provers.mli
@@ -91,6 +91,22 @@ type prover_result_parser = {
  (* The parser for a model returned by the solver. *)
  prp_model_parser : Model_parser.model_parser;
 }
+(*
+    if the first field matches the prover output,
+    the second field is the answer. Regexp groups present in
+    the first field are substituted in the second field (\0,\1,...).
+    The regexps are tested in the order of the list.
+
+    @param timeregexps : a list of regular expressions with special
+    markers '%h','%m','%s','%i' (for milliseconds), constructed with
+    [timeregexp] function, and used to extract the time usage from
+    the prover's output. If the list is empty, wallclock is used.
+    The regexps are tested in the order of the list.
+
+    @param exitcodes : if the first field is the exit code, then
+    the second field is the answer. Exit codes are tested in the order
+    of the list and before the regexps.
+*)

 (** {2 Functions for calling external provers} *)
 type prover_call
@@ -130,43 +146,30 @@ val mk_limit : int -> int -> int -> resource_limit
   *)

 val call_on_file :
-  command     : string ->
-  limit       : resource_limit ->
-  res_parser  : prover_result_parser ->
+  command         : string ->
+  limit           : resource_limit ->
+  res_parser      : prover_result_parser ->
  printer_mapping : Printer.printer_mapping ->
-  ?cleanup    : bool ->
-  ?inplace    : bool ->
-  ?redirect   : bool ->
+  ?cleanup        : bool ->
+  ?inplace        : bool ->
+  ?interactive    : bool ->
+  ?redirect       : bool ->
  string -> pre_prover_call

 val call_on_buffer :
-  command     : string ->
-  limit       : resource_limit ->
-  res_parser  : prover_result_parser ->
-  filename    : string ->
+  command         : string ->
+  limit           : resource_limit ->
+  filename        : string ->
  printer_mapping : Printer.printer_mapping ->
-  ?inplace    : bool ->
+  ?inplace        : bool ->
+  ?interactive    : bool ->
  Buffer.t -> pre_prover_call
 (** Call a prover on the task printed in the {!type: Buffer.t} given.

-    @param timelimit : set the available time limit (def. 0 : unlimited)
-    @param memlimit : set the available memory limit (def. 0 : unlimited)
-    @param steplimit : set the available step limit (def. -1 : unlimited)
+    @param limit : set the available time limit (def. 0 : unlimited), memory
+    limit (def. 0 : unlimited) and step limit (def. -1 : unlimited)

-    @param regexps : if the first field matches the prover output,
-    the second field is the answer. Regexp groups present in
-    the first field are substituted in the second field (\0,\1,...).
-    The regexps are tested in the order of the list.
-
-    @param timeregexps : a list of regular expressions with special
-    markers '%h','%m','%s','%i' (for milliseconds), constructed with
-    [timeregexp] function, and used to extract the time usage from
-    the prover's output. If the list is empty, wallclock is used.
-    The regexps are tested in the order of the list.
-
-    @param exitcodes : if the first field is the exit code, then
-    the second field is the answer. Exit codes are tested in the order
-    of the list and before the regexps.
+    @param res_parser : prover result parser

    @param filename : the suffix of the proof task's file, if the prover
    doesn't accept stdin. *)

--- a/src/driver/driver.ml
+++ b/src/driver/driver.ml
@@ -252,10 +252,10 @@ let file_of_theory drv input_file th =
  get_filename drv input_file th.th_name.Ident.id_string "null"

 let call_on_buffer ~command ~limit
-                   ?inplace ~filename ~printer_mapping drv buffer =
+                   ?inplace ?interactive ~filename ~printer_mapping drv buffer =
  Call_provers.call_on_buffer
    ~command ~limit ~res_parser:drv.drv_res_parser
-    ~filename ~printer_mapping ?inplace buffer
+    ~filename ~printer_mapping ?inplace ?interactive buffer


 (** print'n'prove *)
@@ -323,8 +323,7 @@ let print_theory ?old drv fmt th =
  let task = Task.use_export None th in
  print_task ?old drv fmt task

-let prove_task_prepared
-    ~command ~limit ?old ?inplace drv task =
+let prove_task_prepared ~command ~limit ?old ?inplace ?interactive drv task =
  let buf = Buffer.create 1024 in
  let fmt = formatter_of_buffer buf in
  let old_channel = Opt.map open_in old in
@@ -343,13 +342,14 @@ let prove_task_prepared
  in
  let res =
    call_on_buffer ~command ~limit
-                   ?inplace ~filename ~printer_mapping drv buf in
+                   ?inplace ?interactive ~filename ~printer_mapping drv buf in
  Buffer.reset buf;
  res

-let prove_task ~command ~limit ?(cntexample=false) ?old ?inplace drv task =
+let prove_task ~command ~limit ?(cntexample=false) ?old
+               ?inplace ?interactive drv task =
  let task = prepare_task ~cntexample drv task in
-  prove_task_prepared ~command ~limit ?old ?inplace drv task
+  prove_task_prepared ~command ~limit ?old ?inplace ?interactive drv task

 (* exception report *)


--- a/src/driver/driver.mli
+++ b/src/driver/driver.mli
@@ -35,10 +35,11 @@ val file_of_theory : driver -> string -> Theory.theory -> string
    for the prover of driver [d], for a theory [th] from filename [f] *)

 val call_on_buffer :
-  command    : string ->
-  limit      : Call_provers.resource_limit ->
-  ?inplace   : bool ->
-  filename   : string ->
+  command      : string ->
+  limit        : Call_provers.resource_limit ->
+  ?inplace     : bool ->
+  ?interactive : bool ->
+  filename     : string ->
  printer_mapping : Printer.printer_mapping ->
  driver -> Buffer.t -> Call_provers.pre_prover_call

@@ -54,11 +55,12 @@ val print_theory :
  (** produce a realization of the given theory using the given driver *)

 val prove_task :
-  command    : string ->
-  limit      : Call_provers.resource_limit ->
-  ?cntexample : bool ->
-  ?old       : string ->
-  ?inplace   : bool ->
+  command      : string ->
+  limit        : Call_provers.resource_limit ->
+  ?cntexample  : bool ->
+  ?old         : string ->
+  ?inplace     : bool ->
+  ?interactive : bool ->
  driver -> Task.task -> Call_provers.pre_prover_call

 (** Split the previous function in two simpler functions *)
@@ -69,10 +71,11 @@ val print_task_prepared :
  driver -> Format.formatter -> Task.task -> Printer.printer_mapping

 val prove_task_prepared :
-  command    : string ->
-  limit      : Call_provers.resource_limit ->
-  ?old       : string ->
-  ?inplace   : bool ->
+  command      : string ->
+  limit        : Call_provers.resource_limit ->
+  ?old         : string ->
+  ?inplace     : bool ->
+  ?interactive : bool ->
  driver -> Task.task -> Call_provers.pre_prover_call