Commit cff6a051 authored by Andrei Paskevich's avatar Andrei Paskevich

rename the shared library pack to Why3

parent 1f3e60bb
...@@ -159,23 +159,23 @@ LIBCMO = $(addsuffix .cmo, $(LIBMODULES)) ...@@ -159,23 +159,23 @@ LIBCMO = $(addsuffix .cmo, $(LIBMODULES))
LIBCMX = $(addsuffix .cmx, $(LIBMODULES)) LIBCMX = $(addsuffix .cmx, $(LIBMODULES))
$(LIBCMO) $(LIBCMX): INCLUDES += $(LIBINCLUDES) $(LIBCMO) $(LIBCMX): INCLUDES += $(LIBINCLUDES)
$(LIBCMX): OFLAGS += -for-pack Why $(LIBCMX): OFLAGS += -for-pack Why3
# build targets # build targets
byte: src/why.cma byte: src/why3.cma
opt: src/why.cmxa opt: src/why3.cmxa
src/why.cma: src/why.cmo src/why3.cma: src/why3.cmo
$(OCAMLC) -a $(BFLAGS) -o $@ $^ $(OCAMLC) -a $(BFLAGS) -o $@ $^
src/why.cmxa: src/why.cmx src/why3.cmxa: src/why3.cmx
$(OCAMLOPT) -a $(OFLAGS) -o $@ $^ $(OCAMLOPT) -a $(OFLAGS) -o $@ $^
src/why.cmo: $(LIBCMO) src/why3.cmo: $(LIBCMO)
$(OCAMLC) $(BFLAGS) -pack -o $@ $^ $(OCAMLC) $(BFLAGS) -pack -o $@ $^
src/why.cmx: $(LIBCMX) src/why3.cmx: $(LIBCMX)
$(OCAMLOPT) $(OFLAGS) -pack -o $@ $^ $(OCAMLOPT) $(OFLAGS) -pack -o $@ $^
# depend target # depend target
...@@ -199,7 +199,7 @@ LIBCLEAN = $(addsuffix /*.cm[iox], $(LIBSDIRS)) \ ...@@ -199,7 +199,7 @@ LIBCLEAN = $(addsuffix /*.cm[iox], $(LIBSDIRS)) \
clean:: clean::
rm -f $(LIBCLEAN) $(LIBGENERATED) rm -f $(LIBCLEAN) $(LIBGENERATED)
rm -f src/why.cm[iox] src/why.[ao] src/why.cma src/why.cmxa rm -f src/why3.cm[aiox] src/why3.[ao] src/why3.cmxa
rm -f .depend.lib rm -f .depend.lib
############### ###############
...@@ -227,9 +227,9 @@ install_no_local:: ...@@ -227,9 +227,9 @@ install_no_local::
install_no_local_lib:: install_no_local_lib::
mkdir -p $(OCAMLLIB)/why3 mkdir -p $(OCAMLLIB)/why3
cp -f src/why.cm* $(OCAMLLIB)/why3 cp -f src/why3.cm* $(OCAMLLIB)/why3
cp -f META $(OCAMLLIB)/why3 cp -f META $(OCAMLLIB)/why3
if test -f src/why.a; then cp -f src/why.a $(OCAMLLIB)/why3; fi if test -f src/why3.a; then cp -f src/why3.a $(OCAMLLIB)/why3; fi
ifeq (@enable_local@,yes) ifeq (@enable_local@,yes)
install install-lib: install install-lib:
...@@ -250,20 +250,20 @@ install-all: install install-lib ...@@ -250,20 +250,20 @@ install-all: install install-lib
byte: bin/why3.byte byte: bin/why3.byte
opt: bin/why3.opt opt: bin/why3.opt
bin/why3.opt: src/why.cmxa src/main.cmx bin/why3.opt: src/why3.cmxa src/main.cmx
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^ $(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^
$(STRIP) $@ $(STRIP) $@
bin/why3.byte: src/why.cma src/main.cmo bin/why3.byte: src/why3.cma src/main.cmo
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^ $(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^
bin/why3: bin/why3.@OCAMLBEST@ bin/why3: bin/why3.@OCAMLBEST@
ln -sf why3.@OCAMLBEST@ $@ ln -sf why3.@OCAMLBEST@ $@
src/main.cmo: src/why.cma src/main.cmo: src/why3.cma
src/main.cmx: src/why.cmxa src/main.cmx: src/why3.cmxa
clean:: clean::
rm -f src/main.cm[iox] src/main.annot src/main.o rm -f src/main.cm[iox] src/main.annot src/main.o
...@@ -295,12 +295,12 @@ $(PGMCMO) $(PGMCMX): INCLUDES += -I src/programs ...@@ -295,12 +295,12 @@ $(PGMCMO) $(PGMCMX): INCLUDES += -I src/programs
byte: bin/why3ml.byte byte: bin/why3ml.byte
opt: bin/why3ml.opt opt: bin/why3ml.opt
bin/why3ml.opt: src/why.cmxa $(PGMCMX) src/main.cmx bin/why3ml.opt: src/why3.cmxa $(PGMCMX) src/main.cmx
$(if $(QUIET), @echo 'Linking $@' &&) \ $(if $(QUIET), @echo 'Linking $@' &&) \
$(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^ $(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^
$(STRIP) $@ $(STRIP) $@
bin/why3ml.byte: src/why.cma $(PGMCMO) src/main.cmo bin/why3ml.byte: src/why3.cma $(PGMCMO) src/main.cmo
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^ $(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^
...@@ -385,12 +385,12 @@ $(CONFIGCMO) $(CONFIGCMX): INCLUDES += -I src/programs ...@@ -385,12 +385,12 @@ $(CONFIGCMO) $(CONFIGCMX): INCLUDES += -I src/programs
byte: bin/why3config.byte byte: bin/why3config.byte
opt: bin/why3config.opt opt: bin/why3config.opt
bin/why3config.opt: src/why.cmxa $(CONFIGCMX) bin/why3config.opt: src/why3.cmxa $(CONFIGCMX)
$(if $(QUIET), @echo 'Linking $@' &&) \ $(if $(QUIET), @echo 'Linking $@' &&) \
$(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^ $(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^
$(STRIP) $@ $(STRIP) $@
bin/why3config.byte: src/why.cma $(CONFIGCMO) bin/why3config.byte: src/why3.cma $(CONFIGCMO)
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^ $(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^
...@@ -449,12 +449,12 @@ bin/why3ide.opt bin/why3ide.byte: INCLUDES += -I @LABLGTK2LIB@ ...@@ -449,12 +449,12 @@ bin/why3ide.opt bin/why3ide.byte: INCLUDES += -I @LABLGTK2LIB@
bin/why3ide.opt bin/why3ide.byte: EXTOBJS += bin/why3ide.opt bin/why3ide.byte: EXTOBJS +=
bin/why3ide.opt bin/why3ide.byte: EXTLIBS += lablgtk lablgtksourceview2 bin/why3ide.opt bin/why3ide.byte: EXTLIBS += lablgtk lablgtksourceview2
bin/why3ide.opt: src/why.cmxa $(PGMCMX) $(IDECMX) bin/why3ide.opt: src/why3.cmxa $(PGMCMX) $(IDECMX)
$(if $(QUIET), @echo 'Linking $@' &&) \ $(if $(QUIET), @echo 'Linking $@' &&) \
$(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^ $(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^
$(STRIP) $@ $(STRIP) $@
bin/why3ide.byte: src/why.cma $(PGMCMO) $(IDECMO) bin/why3ide.byte: src/why3.cma $(PGMCMO) $(IDECMO)
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^ $(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^
...@@ -505,12 +505,12 @@ $(REPLAYERCMO) $(REPLAYERCMX): INCLUDES += -I src/ide ...@@ -505,12 +505,12 @@ $(REPLAYERCMO) $(REPLAYERCMX): INCLUDES += -I src/ide
byte: bin/why3replayer.byte byte: bin/why3replayer.byte
opt: bin/why3replayer.opt opt: bin/why3replayer.opt
bin/why3replayer.opt: src/why.cmxa $(PGMCMX) $(REPLAYERCMX) bin/why3replayer.opt: src/why3.cmxa $(PGMCMX) $(REPLAYERCMX)
$(if $(QUIET), @echo 'Linking $@' &&) \ $(if $(QUIET), @echo 'Linking $@' &&) \
$(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^ $(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^
$(STRIP) $@ $(STRIP) $@
bin/why3replayer.byte: src/why.cma $(PGMCMO) $(REPLAYERCMO) bin/why3replayer.byte: src/why3.cma $(PGMCMO) $(REPLAYERCMO)
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^ $(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^
...@@ -566,12 +566,12 @@ opt: bin/why3bench.opt ...@@ -566,12 +566,12 @@ opt: bin/why3bench.opt
bin/why3bench.opt bin/why3bench.byte: INCLUDES += -thread -I +threads -I @SQLITE3LIB@ bin/why3bench.opt bin/why3bench.byte: INCLUDES += -thread -I +threads -I @SQLITE3LIB@
bin/why3bench.opt bin/why3bench.byte: EXTLIBS += threads sqlite3 bin/why3bench.opt bin/why3bench.byte: EXTLIBS += threads sqlite3
bin/why3bench.opt: src/why.cmxa $(PGMCMX) $(BENCHCMX) bin/why3bench.opt: src/why3.cmxa $(PGMCMX) $(BENCHCMX)
$(if $(QUIET), @echo 'Linking $@' &&) \ $(if $(QUIET), @echo 'Linking $@' &&) \
$(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^ $(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^
$(STRIP) $@ $(STRIP) $@
bin/why3bench.byte: src/why.cma $(PGMCMO) $(BENCHCMO) bin/why3bench.byte: src/why3.cma $(PGMCMO) $(BENCHCMO)
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^ $(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^
...@@ -627,10 +627,10 @@ opt: src/coq-plugin/whytac.cmxs ...@@ -627,10 +627,10 @@ opt: src/coq-plugin/whytac.cmxs
src/coq-plugin/whytac.cma: BFLAGS+=-rectypes -I +camlp5 src/coq-plugin/whytac.cma: BFLAGS+=-rectypes -I +camlp5
src/coq-plugin/whytac.cmxs: OFLAGS+=-rectypes -I +camlp5 src/coq-plugin/whytac.cmxs: OFLAGS+=-rectypes -I +camlp5
src/coq-plugin/whytac.cmxs: src/why.cmxa $(COQCMX) src/coq-plugin/whytac.cmxs: src/why3.cmxa $(COQCMX)
$(OCAMLOPT) $(OFLAGS) -o $@ -shared $^ $(OCAMLOPT) $(OFLAGS) -o $@ -shared $^
src/coq-plugin/whytac.cma: src/why.cma $(COQCMO) src/coq-plugin/whytac.cma: src/why3.cma $(COQCMO)
$(OCAMLC) -a $(BFLAGS) -o $@ $^ $(OCAMLC) -a $(BFLAGS) -o $@ $^
src/coq-plugin/g_whytac.ml: src/coq-plugin/g_whytac.ml4 src/coq-plugin/g_whytac.ml: src/coq-plugin/g_whytac.ml4
...@@ -751,12 +751,12 @@ $(WHY3DOCCMO) $(WHY3DOCCMX): INCLUDES += -I src/why3doc ...@@ -751,12 +751,12 @@ $(WHY3DOCCMO) $(WHY3DOCCMX): INCLUDES += -I src/why3doc
byte: bin/why3doc.byte byte: bin/why3doc.byte
opt: bin/why3doc.opt opt: bin/why3doc.opt
bin/why3doc.opt: src/why.cmxa $(WHY3DOCCMX) bin/why3doc.opt: src/why3.cmxa $(WHY3DOCCMX)
$(if $(QUIET), @echo 'Linking $@' &&) \ $(if $(QUIET), @echo 'Linking $@' &&) \
$(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^ $(OCAMLOPT) $(OFLAGS) -o $@ $(EXTCMXA) $^
$(STRIP) $@ $(STRIP) $@
bin/why3doc.byte: src/why.cma $(WHY3DOCCMO) bin/why3doc.byte: src/why3.cma $(WHY3DOCCMO)
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^ $(OCAMLC) $(BFLAGS) -o $@ $(EXTCMA) $^
...@@ -807,7 +807,7 @@ comp_bench_plugins:: $(BENCH_PLUGINS_CMO) $(BENCH_PLUGINS_CMXS) ...@@ -807,7 +807,7 @@ comp_bench_plugins:: $(BENCH_PLUGINS_CMO) $(BENCH_PLUGINS_CMXS)
# bench_plugins:: $(BENCH_PLUGINS_CMO) $(BENCH_PLUGINS_CMXS) byte $(TOOLS) # bench_plugins:: $(BENCH_PLUGINS_CMO) $(BENCH_PLUGINS_CMXS) byte $(TOOLS)
# bin/why3.byte -D bench/plugins/helloworld.drv \ # bin/why3.byte -D bench/plugins/helloworld.drv \
# tests/test-jcf.why -T Test -G G # tests/test-jcf.why -T Test -G G
# bin/why.$(OCAMLBEST) -D bench/plugins/helloworld.drv \ # bin/why3.$(OCAMLBEST) -D bench/plugins/helloworld.drv \
# tests/test-jcf.why -T Test -G G # tests/test-jcf.why -T Test -G G
############### ###############
...@@ -849,12 +849,12 @@ testl-ide: bin/why3ide.opt ...@@ -849,12 +849,12 @@ testl-ide: bin/why3ide.opt
testl-type: bin/why3ml.byte testl-type: bin/why3ml.byte
ocamlrun -bt bin/why3ml.byte --type-only tests/test-pgm-jcf.mlw ocamlrun -bt bin/why3ml.byte --type-only tests/test-pgm-jcf.mlw
test-api: src/why.cma test-api: src/why3.cma
ocaml -I src/ $(INCLUDES) $(EXTCMA) src/why.cma examples/use_api.ml \ ocaml -I src/ $(INCLUDES) $(EXTCMA) src/why3.cma examples/use_api.ml \
|| (printf "Test of Why API calls failed. Please fix it"; exit 2) || (printf "Test of Why API calls failed. Please fix it"; exit 2)
bts12244: src/why.cma bts12244: src/why3.cma
ocaml -I src/ $(INCLUDES) $(EXTCMA) src/why.cma examples/bts12244.ml ocaml -I src/ $(INCLUDES) $(EXTCMA) src/why3.cma examples/bts12244.ml
## Examples : Plugins ## ## Examples : Plugins ##
...@@ -876,8 +876,8 @@ PLUGCMXS = $(addsuffix .cmxs, $(PLUGMODULES)) ...@@ -876,8 +876,8 @@ PLUGCMXS = $(addsuffix .cmxs, $(PLUGMODULES))
# opt: src/plug-plugin/whytac.cmxs # opt: src/plug-plugin/whytac.cmxs
# endif # endif
# $(PLUGCMO): src/why.cma # $(PLUGCMO): src/why3.cma
# $(PLUGCMXS): src/why.cmxa # $(PLUGCMXS): src/why3.cmxa
.PHONY: examples_plugins.byte examples_plugins.opt .PHONY: examples_plugins.byte examples_plugins.opt
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
*) *)
open Why open Why3
open Format open Format
(*************** (***************
......
...@@ -25,7 +25,7 @@ the alt-ergo prover to check them ...@@ -25,7 +25,7 @@ the alt-ergo prover to check them
******************) ******************)
(* opening the Why3 library *) (* opening the Why3 library *)
open Why open Why3
(* a ground propositional goal: true or false *) (* a ground propositional goal: true or false *)
let fmla_true : Term.term = Term.t_true let fmla_true : Term.term = Term.t_true
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(**************************************************************************) (**************************************************************************)
open Thread open Thread
open Why open Why3
open Util open Util
open Env open Env
open Theory open Theory
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
open Why open Why3
open Env open Env
open Theory open Theory
open Task open Task
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
(** run benchs from the database *) (** run benchs from the database *)
open Format open Format
open Why open Why3
open Util open Util
module BenchUtil = Bench.BenchUtil module BenchUtil = Bench.BenchUtil
......
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
(** run benchs from the database *) (** run benchs from the database *)
open Why open Why3
val db : Whyconf.config -> Env.env -> unit val db : Whyconf.config -> Env.env -> unit
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
open Format open Format
open Bench open Bench
open Why open Why3
open Util open Util
open Theory open Theory
......
...@@ -58,7 +58,7 @@ csv = "prgbench.csv" ...@@ -58,7 +58,7 @@ csv = "prgbench.csv"
*) *)
open Bench open Bench
open Why open Why3
open Util open Util
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(**************************************************************************) (**************************************************************************)
open Format open Format
open Why open Why3
open Util open Util
open Whyconf open Whyconf
open Theory open Theory
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(**************************************************************************) (**************************************************************************)
open Format open Format
open Why open Why3
open Util open Util
open Whyconf open Whyconf
......
...@@ -30,7 +30,7 @@ open Libnames ...@@ -30,7 +30,7 @@ open Libnames
open Declarations open Declarations
open Pp open Pp
open Why open Why3
open Call_provers open Call_provers
open Whyconf open Whyconf
open Ty open Ty
...@@ -62,10 +62,10 @@ let get_prover s = ...@@ -62,10 +62,10 @@ let get_prover s =
let print_constr fmt c = pp_with fmt (Termops.print_constr c) let print_constr fmt c = pp_with fmt (Termops.print_constr c)
let print_tvm fmt m = let print_tvm fmt m =
Idmap.iter (fun id tv -> Format.fprintf fmt "%s->%a@ " Idmap.iter (fun id tv -> Format.fprintf fmt "%s->%a@ "
(string_of_id id) Why.Pretty.print_tv tv) m (string_of_id id) Why3.Pretty.print_tv tv) m
let print_bv fmt m = let print_bv fmt m =
Idmap.iter (fun id vs -> Format.fprintf fmt "%s->%a@ " Idmap.iter (fun id vs -> Format.fprintf fmt "%s->%a@ "
(string_of_id id) Why.Pretty.print_vsty vs) m (string_of_id id) Why3.Pretty.print_vsty vs) m
(* Coq constants *) (* Coq constants *)
let logic_dir = ["Coq";"Logic";"Decidable"] let logic_dir = ["Coq";"Logic";"Decidable"]
......
...@@ -305,7 +305,7 @@ let () = Exn_printer.register (fun fmt exn -> match exn with ...@@ -305,7 +305,7 @@ let () = Exn_printer.register (fun fmt exn -> match exn with
| NoPrinter -> Format.fprintf fmt | NoPrinter -> Format.fprintf fmt
"No printer specified in the driver file" "No printer specified in the driver file"
| NoPlugins -> Format.fprintf fmt | NoPlugins -> Format.fprintf fmt
"Plugins are not supported, recomplie Why" "Plugins are not supported, recomplie Why3"
| Duplicate s -> Format.fprintf fmt | Duplicate s -> Format.fprintf fmt
"Duplicate %s specification" s "Duplicate %s specification" s
| UnknownType (thl,idl) -> Format.fprintf fmt | UnknownType (thl,idl) -> Format.fprintf fmt
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
(** Managing the configuration of Why *) (** Managing the configuration of Why3 *)
open Util open Util
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
open Why open Why3
open Sqlite3 open Sqlite3
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
open Why open Why3
(** Proof database *) (** Proof database *)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(**************************************************************************) (**************************************************************************)
open Format open Format
open Why open Why3
open Util open Util
open Rc open Rc
open Whyconf open Whyconf
...@@ -272,7 +272,7 @@ let () = ...@@ -272,7 +272,7 @@ let () =
eprintf " done.@." eprintf " done.@."
let show_legend_window () = let show_legend_window () =
let dialog = GWindow.dialog ~title:"Why: legend of icons" () in let dialog = GWindow.dialog ~title:"Why3: legend of icons" () in
let vbox = dialog#vbox in let vbox = dialog#vbox in
let text = GText.view ~packing:vbox#add let text = GText.view ~packing:vbox#add
~editable:false ~cursor_visible:false () in ~editable:false ~cursor_visible:false () in
...@@ -340,7 +340,7 @@ let set_labels_flag = ...@@ -340,7 +340,7 @@ let set_labels_flag =
(if b then Debug.set_flag else Debug.unset_flag) fl (if b then Debug.set_flag else Debug.unset_flag) fl
let preferences c = let preferences c =
let dialog = GWindow.dialog ~title:"Why: preferences" () in let dialog = GWindow.dialog ~title:"Why3: preferences" () in
let vbox = dialog#vbox in let vbox = dialog#vbox in
let notebook = GPack.notebook ~packing:vbox#add () in let notebook = GPack.notebook ~packing:vbox#add () in
(** page 1 **) (** page 1 **)
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
open Why open Why3
(* (*
type prover_data = Session.prover_data type prover_data = Session.prover_data
...@@ -38,14 +38,14 @@ type t = ...@@ -38,14 +38,14 @@ type t =
mutable default_editor : string; mutable default_editor : string;
mutable show_labels : bool; mutable show_labels : bool;
mutable saving_policy : int; mutable saving_policy : int;
mutable env : Why.Env.env; mutable env : Why3.Env.env;
mutable config : Whyconf.config; mutable config : Whyconf.config;
} }
(* (*
val get_prover_data : Why.Env.env -> string -> val get_prover_data : Why3.Env.env -> string ->
Why.Whyconf.config_prover -> Why3.Whyconf.config_prover ->
prover_data Why.Util.Mstr.t -> prover_data Why.Util.Mstr.t prover_data Why3.Util.Mstr.t -> prover_data Why3.Util.Mstr.t
*) *)
val save_config : unit -> unit val save_config : unit -> unit
......
...@@ -26,7 +26,7 @@ let () = ...@@ -26,7 +26,7 @@ let () =
eprintf " done.@." eprintf " done.@."
open Why open Why3
open Whyconf open Whyconf
open Gconfig open Gconfig
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(**************************************************************************) (**************************************************************************)
open Why open Why3
let includes = ref [] let includes = ref []
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(**************************************************************************) (**************************************************************************)
open Why open Why3
open Format open Format
(***************************) (***************************)
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
(** Proof sessions *) (** Proof sessions *)
open Why open Why3
(** {2 Prover's data} *) (** {2 Prover's data} *)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(**************************************************************************) (**************************************************************************)
open Format open Format
open Why open Why3
open Util open Util
open Whyconf open Whyconf
open Theory open Theory
...@@ -406,7 +406,7 @@ let output_task_prepared drv fname _tname th task dir = ...@@ -406,7 +406,7 @@ let output_task_prepared drv fname _tname th task dir =
close_out cout close_out cout
let do_task drv fname tname (th : Why.Theory.theory) (task : Task.task) = let do_task drv fname tname (th : Theory.theory) (task : Task.task) =
match !opt_output, !opt_command with match !opt_output, !opt_command with
| Some dir, Some command when !opt_bisect -> | Some dir, Some command when !opt_bisect ->
let test task = let test task =
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
open Why open Why3
open Util open Util
open Ident open Ident
open Term open Term
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
open Why open Why3
open Term open Term
type reference = type reference =
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
open Why open Why3
open Util open Util
open Theory open Theory
open Pgm_module open Pgm_module
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *)