diff options
| author | Cyril Cohen | 2020-08-11 02:25:31 +0200 |
|---|---|---|
| committer | GitHub | 2020-08-11 02:25:31 +0200 |
| commit | 0265476610747475a856f0560a86fe3b5409469f (patch) | |
| tree | 152e0b99c59b748f01a553fc149ac4588be4219b | |
| parent | 3728862662bd0a5b836dfa746921954604d051ec (diff) | |
| parent | 36613c83d65aa821b01a9fac38c479af65ef3589 (diff) | |
Merge pull request #536 from pi8027/hierarchy
Fix some hierarchy.ml related issues
| -rw-r--r-- | etc/utils/hierarchy.ml | 13 | ||||
| -rw-r--r-- | mathcomp/Make.test-suite | 2 | ||||
| -rw-r--r-- | mathcomp/Makefile.common | 10 |
3 files changed, 15 insertions, 10 deletions
diff --git a/etc/utils/hierarchy.ml b/etc/utils/hierarchy.ml index 1d25993..f764e9a 100644 --- a/etc/utils/hierarchy.ml +++ b/etc/utils/hierarchy.ml @@ -161,8 +161,8 @@ Tactic Notation "check_join" let T1 := open_constr:(_ : t1) in let T2 := open_constr:(_ : t2) in match tt with - | _ => unify ((id : t1 -> Type) T1) ((id : t2 -> Type) T2) - | _ => fail "There is no join of" t1 "and" t2 + | _ => unify ((fun x : t1 => x : Type) T1) ((fun x : t2 => x : Type) T2) + | _ => fail "There is no join of" t1 "and" t2 "but is expected to be" tjoin end; let Tjoin := lazymatch T1 with @@ -239,7 +239,7 @@ let () = String.concat " " (List.map (fun (path, log) -> Printf.sprintf "-R %S %S" path log) !opt_libmaps)) - [||] + (Unix.environment ()) in Printf.fprintf coqtop_in {| Set Printing Width 4611686018427387903. @@ -251,8 +251,11 @@ Redirect %S Print Graph. (List.hd (String.split_on_char '.' tmp_canonicals)) (List.hd (String.split_on_char '.' tmp_coercions)); close_out coqtop_in; - try while true do ignore (input_line coqtop_out) done - with End_of_file -> ignore (Unix.close_process_full coqtop_ch) + try + while true do ignore (input_line coqtop_out) done + with End_of_file -> + if Unix.close_process_full coqtop_ch <> WEXITED 0 then + failwith "Failed to invoke coqtop." end; (* Parsing *) let canonicals = parse_canonicals tmp_canonicals in diff --git a/mathcomp/Make.test-suite b/mathcomp/Make.test-suite index 2be741b..0b51909 100644 --- a/mathcomp/Make.test-suite +++ b/mathcomp/Make.test-suite @@ -1,4 +1,4 @@ -test_suite/hierarchy_test.v +test_suite/test_hierarchy_all.v test_suite/test_ssrAC.v test_suite/test_guard.v diff --git a/mathcomp/Makefile.common b/mathcomp/Makefile.common index 857ddef..b6b71ea 100644 --- a/mathcomp/Makefile.common +++ b/mathcomp/Makefile.common @@ -56,11 +56,10 @@ Makefile.coq: pre-makefile $(COQPROJECT) Makefile # Test suite --------------------------------------------------------- -test_suite/hierarchy_test.v: build - mkdir -p test_suite - COQBIN=$(COQBIN) ocaml ../etc/utils/hierarchy.ml -verify -R . mathcomp -lib all.all > test_suite/hierarchy_test.v +test_suite/test_hierarchy_all.v: build + COQBIN=$(COQBIN) ocaml ../etc/utils/hierarchy.ml -verify -R . mathcomp -lib all.all > test_suite/test_hierarchy_all.v -Makefile.test-suite.coq: test_suite/hierarchy_test.v +Makefile.test-suite.coq: test_suite/test_hierarchy_all.v $(COQMAKEFILE) $(COQMAKEFILEOPTIONS) -f Make.test-suite -o Makefile.test-suite.coq # Global config, build, clean and distclean -------------------------- @@ -128,6 +127,9 @@ endif %.vo: __always__ Makefile.coq +$(COQMAKE) $@ +test_suite/%.vo: __always__ Makefile.test-suite.coq + +$(COQMAKE_TESTSUITE) $@ + doc: __always__ Makefile.coq mkdir -p _build_doc/ cp -r $(COQFILES) -t _build_doc/ --parents |