From cfbfe13f5b515ae2e3c6cdd97e2ccee03bc26e56 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sun, 1 Feb 2009 00:54:40 +0100 Subject: Imported Upstream version 8.2~rc2+dfsg --- dev/doc/changes.txt | 5 +++++ dev/ocamldebug-coq.template | 4 ++-- dev/ocamlweb-doc/Makefile | 2 +- dev/top_printers.ml | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'dev') diff --git a/dev/doc/changes.txt b/dev/doc/changes.txt index b7545e09..cae948a0 100644 --- a/dev/doc/changes.txt +++ b/dev/doc/changes.txt @@ -16,6 +16,11 @@ Eauto: e_resolve_constr, vernac_e_resolve_constr -> simplest_eapply Tactics: apply_with_bindings -> apply_with_bindings_wo_evars Eauto.simplest_apply -> Hiddentac.h_simplest_apply Evarutil.define_evar_as_arrow -> define_evar_as_product +Old version of Tactics.assert_tac disappears +Tactics.true_cut renamed into Tactics.assert_tac +Constrintern.interp_constrpattern -> intern_constr_pattern +Hipattern.match_with_conjunction is a bit more restrictive +Hipattern.match_with_disjunction is a bit more restrictive ** Universe names (univ.mli) diff --git a/dev/ocamldebug-coq.template b/dev/ocamldebug-coq.template index ac5ec1e0..560d06d9 100644 --- a/dev/ocamldebug-coq.template +++ b/dev/ocamldebug-coq.template @@ -17,13 +17,13 @@ exec $OCAMLDEBUG \ -I $COQTOP/library -I $COQTOP/pretyping -I $COQTOP/parsing \ -I $COQTOP/interp -I $COQTOP/proofs -I $COQTOP/tactics \ -I $COQTOP/toplevel -I $COQTOP/dev -I $COQTOP/config \ - -I $COQTOP/translate \ -I $COQTOP/contrib/extraction -I $COQTOP/contrib/field \ -I $COQTOP/contrib/fourier -I $COQTOP/contrib/firstorder \ - -I $COQTOP/contrib/interface -I $COQTOP/contrib/jprover \ + -I $COQTOP/contrib/interface \ -I $COQTOP/contrib/omega -I $COQTOP/contrib/romega \ -I $COQTOP/contrib/ring -I $COQTOP/contrib/xml \ -I $COQTOP/contrib/subtac -I $COQTOP/contrib/funind \ -I $COQTOP/contrib/rtauto -I $COQTOP/contrib/setoid_ring \ -I $COQTOP/contrib/recdef -I $COQTOP/contrib/dp \ + -I $COQTOP/ide \ $* diff --git a/dev/ocamlweb-doc/Makefile b/dev/ocamlweb-doc/Makefile index 7ab1bd3f..f2c625ed 100644 --- a/dev/ocamlweb-doc/Makefile +++ b/dev/ocamlweb-doc/Makefile @@ -8,7 +8,7 @@ LOCALINCLUDES=-I ../../config -I ../../tools -I ../../tools/coqdoc \ -I ../../contrib/ring -I ../../contrib/dp -I ../../contrib/setoid_ring \ -I ../../contrib/xml -I ../../contrib/extraction \ -I ../../contrib/interface -I ../../contrib/fourier \ - -I ../../contrib/jprover -I ../../contrib/cc \ + -I ../../contrib/cc \ -I ../../contrib/funind -I ../../contrib/firstorder \ -I ../../contrib/field -I ../../contrib/subtac -I ../../contrib/rtauto \ -I ../../contrib/recdef diff --git a/dev/top_printers.ml b/dev/top_printers.ml index a2285015..d7d2f6d8 100644 --- a/dev/top_printers.ml +++ b/dev/top_printers.ml @@ -340,7 +340,8 @@ let rec pr_argument_type = function | StringArgType -> str"string" | PreIdentArgType -> str"pre-ident" | IntroPatternArgType -> str"intro-pattern" - | IdentArgType -> str"ident" + | IdentArgType true -> str"ident" + | IdentArgType false -> str"pattern_ident" | VarArgType -> str"var" | RefArgType -> str"ref" (* Specific types *) -- cgit v1.2.3