diff options
| author | Maxime Dénès | 2017-03-23 14:50:03 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2017-03-23 14:50:03 +0100 |
| commit | b26fe2bc160e3b6362e97b8331a6d0831b9985f1 (patch) | |
| tree | 6530e61c2dc8d51a84b13bcbab2e5e114b47e5ce /plugins | |
| parent | 595a6251c90d871f8928784c8f4375077c6c5878 (diff) | |
| parent | 9f69250d5ba4116bad85662830460f1519edbe30 (diff) | |
Merge branch 'v8.6' into trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/extraction/Extraction.v | 0 | ||||
| -rw-r--r-- | plugins/extraction/vo.itarget | 1 | ||||
| -rw-r--r-- | plugins/funind/FunInd.v | 0 | ||||
| -rw-r--r-- | plugins/funind/functional_principles_proofs.ml | 3 | ||||
| -rw-r--r-- | plugins/funind/vo.itarget | 1 |
5 files changed, 3 insertions, 2 deletions
diff --git a/plugins/extraction/Extraction.v b/plugins/extraction/Extraction.v new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/plugins/extraction/Extraction.v diff --git a/plugins/extraction/vo.itarget b/plugins/extraction/vo.itarget index 9c30c5eb3e..3563f71dfc 100644 --- a/plugins/extraction/vo.itarget +++ b/plugins/extraction/vo.itarget @@ -1,3 +1,4 @@ +Extraction.vo ExtrHaskellBasic.vo ExtrHaskellNatNum.vo ExtrHaskellNatInt.vo diff --git a/plugins/funind/FunInd.v b/plugins/funind/FunInd.v new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/plugins/funind/FunInd.v diff --git a/plugins/funind/functional_principles_proofs.ml b/plugins/funind/functional_principles_proofs.ml index 527f4f0b12..3199474dde 100644 --- a/plugins/funind/functional_principles_proofs.ml +++ b/plugins/funind/functional_principles_proofs.ml @@ -1217,7 +1217,7 @@ let prove_princ_for_struct (evd:Evd.evar_map ref) interactive_proof fun_num fnam let mk_fixes : tactic = let pre_info,infos = list_chop fun_num infos in match pre_info,infos with - | [],[] -> tclIDTAC + | _,[] -> tclIDTAC | _, this_fix_info::others_infos -> let other_fix_infos = List.map @@ -1233,7 +1233,6 @@ let prove_princ_for_struct (evd:Evd.evar_map ref) interactive_proof fun_num fnam else Proofview.V82.of_tactic (Tactics.mutual_fix this_fix_info.name (this_fix_info.idx + 1) other_fix_infos 0) - | _ -> anomaly (Pp.str "Not a valid information") in let first_tac : tactic = (* every operations until fix creations *) tclTHENSEQ diff --git a/plugins/funind/vo.itarget b/plugins/funind/vo.itarget index 33c9683028..a17a5ec122 100644 --- a/plugins/funind/vo.itarget +++ b/plugins/funind/vo.itarget @@ -1 +1,2 @@ +FunInd.vo Recdef.vo |