Commit a949118f authored by Andrei Paskevich's avatar Andrei Paskevich

Merge remote-tracking branch 'origin/master' into new_system

The only recent change in master currently ignored in
this merge is renaming mach.Array.Array63.array to array63.
If we decide to give array types in mach.Array specific names,
we should do it for every size, and not only for 63 bits.
parents 1efedb5b 2411344a
/examples/in_progress/ export-ignore
/examples/hoare_logic/draft/ export-ignore
/tests/ export-ignore
/bench/encoding/ export-ignore
/share/images/boomy/ export-ignore
/share/images/boomy.rc export-ignore
/share/javascript/ export-ignore
/misc/ export-ignore
/ROADMAP export-ignore
/DEVELOPER.readme export-ignore
/opam/ export-ignore
.gitignore export-ignore
.gitattributes export-ignore
/check.sh export-ignore
/.merlin.in export-ignore
/TODO export-ignore
......@@ -18,6 +18,7 @@ why3.conf
*.vo
*.vd
*.glob
.*.aux
*.elc
*.summary
\#*\#
......@@ -143,6 +144,9 @@ why3.conf
/src/coq-tactic/why3tac.ml
/src/coq-tactic/.why3-vo-*
# Coq
/lib/coq/bv/BV_Gen.v
# PVS
.pvscontext
orphaned-proofs.prf
......@@ -155,11 +159,12 @@ pvsbin/
/lib/isabelle/number/
/lib/isabelle/list/
/lib/isabelle/map/
/lib/isabelle/real/
/lib/isabelle/set/
/lib/isabelle/Tools/why3
/lib/isabelle/Why3_Number.thy
/lib/isabelle/Why3_BV.thy
/lib/isabelle/why3.ML
/lib/isabelle/last_build
/lib/isabelle/bv
# /src/driver/
/src/driver/driver_lexer.ml
......@@ -218,6 +223,10 @@ pvsbin/
/examples/in_progress/binary_search2/
/examples/in_progress/binary_search_c/
/examples/in_progress/vacid_0_red_black_trees_harness/
/examples/in_progress/prover/bench/*/*.out
/examples/in_progress/prover/bench/*/*.txt
/examples/in_progress/prover/bench1
/examples/in_progress/prover/bench2
/examples/why3bench.html
/examples/why3regtests.err
/examples/why3regtests.out
......@@ -256,7 +265,9 @@ pvsbin/
/examples/in_progress/bigInt/*__*.ml
/examples/in_progress/mp/jsmain.js
/examples/in_progress/mp/*__*.ml
/examples/in_progress/prover/build/*__*.ml
/examples/in_progress/prover/.depend
/examples/in_progress/prover/build/prover
# modules
/modules/string/
......@@ -266,6 +277,15 @@ pvsbin/
/modules/mach/array/
/modules/mach/int/
# Try Why3
/src/trywhy3/trywhy3.js
/src/trywhy3/trywhy3.byte
/src/trywhy3/index.en.html
/src/trywhy3/index.fr.html
/src/trywhy3/index.html
/src/trywhy3/ace-builds
/src/trywhy3/*.png
/src/trywhy3/alt-ergo-1.00-private-2015-01-29
# jessie3
/src/jessie/config.log
......
......@@ -22,4 +22,3 @@ with contributions of
Asma Tafat
Piotr Trojanek
Makarius Wenzel
* marks an incompatible change
Language
* Add new logical connectives "by" and "so" as keywords
Tools
o add a command-line option --extra-expl-prefix to specify
additional possible prefixes for VC explanations. (Available for
why3 commands "prove" and "ide".)
Transformations
* All split transformations respect the "stop_split" label now.
split_*_wp is a synonym for split_*_right
* split_*_right split the left-hand side subformulas
when they carry the "case_split" label
* split_intro is now the composition of split_goal_right and
introduce_premises
Library
* improved bitvector theories
API
* Renamed functions in Split_goal
* split_intro moved to Introduction
Encodings
* When a task has no polymorphic object (except for the special
cases of equality and maps) then the translation to SMT-LIB
format is direct
Provers
* discarded support for Alt-Ergo versions older than 0.95.2
o support for Alt-Ergo 1.01 (released Feb 16, 2016) and
non-free versions 1.10 and 1.20
o support for Coq 8.4pl6 (released Apr 9, 2015)
o support for Coq 8.5 (released Jan 21, 2016)
o support for Gappa 1.2.0 (released May 19, 2015)
* discarded support for Isabelle 2014
o support for Isabelle 2015 (released May 25, 2015) and
Isabelle 2016 (released Feb 17, 2016)
o support for Z3 4.4.0 (released Apr 29, 2015) and
4.4.1 (released Oct 5, 2015)
o support for Zenon 0.8.0 (released Oct 21, 2014)
o support for Zenon_modulo 0.4.1 (released Jul 2, 2015)
Distribution
* non-free files are distributed in an extra tar file: "boomy" icon set,
javascript helpers for "why3 session html --style jstree"
Version 0.86.3, February 8, 2016
================================
bug fixes
o assorted bug fixes
provers
o support for Isabelle 2015 (released May 25, 2015)
o fix compilation issues with Coq 8.5
(the tactic for 8.5 now behaves like idtac on successfully proved goals)
Version 0.86.2, October 13, 2015
================================
bug fixes
o assorted bug fixes
Version 0.86.1, May 22, 2015
============================
......
......@@ -14,9 +14,13 @@ of the Library that is distributed under the conditions defined in clause
however invalidate any other reasons why the executable file might be
covered by the GNU Lesser General Public License.
The files src/util/extmap.ml{i} are derived from the sources of
OCaml 3.12 standard library, and are distributed under the GNU
LGPL version 2 (see file OCAML-LICENSE).
Icon sets for the graphical interface of Why3 are subject to specific
licenses, some of them may forbid commercial usage. These specific
licenses are detailed in files share/icons/*/*.txt
licenses are detailed in files share/images/*/*.txt
======================================================================
......
......@@ -170,6 +170,7 @@ LIB_PARSER = ptree glob typing parser lexer
LIB_TRANSFORM = simplify_formula inlining split_goal induction \
detect_polymorphism \
reduction_engine compute \
eliminate_definition eliminate_algebraic \
eliminate_inductive eliminate_let eliminate_if \
libencoding discriminate encoding encoding_select \
......@@ -178,9 +179,9 @@ LIB_TRANSFORM = simplify_formula inlining split_goal induction \
encoding_sort simplify_array filter_trigger \
introduction abstraction close_epsilon lift_epsilon \
eliminate_epsilon intro_projections_counterexmp \
prepare_for_counterexmp \
intro_vc_vars_counterexmp prepare_for_counterexmp \
instantiate_predicate smoke_detector \
reduction_engine compute induction_pr prop_curry
induction_pr prop_curry
LIB_PRINTER = alt_ergo why3printer smtv1 smtv2 coq pvs isabelle \
simplify gappa cvc3 yices mathematica
......@@ -288,8 +289,6 @@ endif
mkdir -p $(TOOLDIR)
mkdir -p $(DATADIR)/why3
mkdir -p $(DATADIR)/why3/images
mkdir -p $(DATADIR)/why3/images/boomy
mkdir -p $(DATADIR)/why3/images/fatcow
mkdir -p $(DATADIR)/why3/vim
mkdir -p $(DATADIR)/why3/lang
mkdir -p $(DATADIR)/why3/theories
......@@ -302,10 +301,13 @@ endif
cp -f drivers/*.drv drivers/*.gen $(DATADIR)/why3/drivers
cp -f LICENSE $(DATADIR)/why3/
cp -f share/provers-detection-data.conf $(DATADIR)/why3/
cp -f share/images/icons.rc $(DATADIR)/why3/images
for i in share/images/*.rc; do \
d=`basename $$i .rc`; \
cp -f $$i $(DATADIR)/why3/images; \
mkdir $(DATADIR)/why3/images/$$d; \
cp -f share/images/$$d/* $(DATADIR)/why3/images/$$d; \
done
cp -f share/images/*.png $(DATADIR)/why3/images
cp -f share/images/boomy/* $(DATADIR)/why3/images/boomy
cp -f share/images/fatcow/* $(DATADIR)/why3/images/fatcow
cp -f share/why3session.dtd $(DATADIR)/why3
cp -f share/Makefile.config $(DATADIR)/why3
cp -rf share/javascript $(DATADIR)/why3/javascript
......@@ -635,6 +637,7 @@ gallery::
GALLERYSUBS=avl