diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-05-15 21:51:21 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-05-28 14:41:39 +0200 |
| commit | b053d98fb17d2f46878f49d7adf4839ae632c10b (patch) | |
| tree | 044bd5fa2380cd0313f1b7cc0d49354be9dc7b4b /kernel/vconv.ml | |
| parent | 5021c6bd8e08fb465152638c9a56108d317002f8 (diff) | |
Remove vm_conv hook and reorganize kernel files
Diffstat (limited to 'kernel/vconv.ml')
| -rw-r--r-- | kernel/vconv.ml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kernel/vconv.ml b/kernel/vconv.ml index f11803b67..6f350951c 100644 --- a/kernel/vconv.ml +++ b/kernel/vconv.ml @@ -185,8 +185,18 @@ and conv_arguments env ?from:(from=0) k args1 args2 cu = !rcu else raise NotConvertible +let warn_bytecode_compiler_failed = + let open Pp in + CWarnings.create ~name:"bytecode-compiler-failed" ~category:"bytecode-compiler" + (fun () -> strbrk "Bytecode compiler failed, " ++ + strbrk "falling back to standard conversion") + let vm_conv_gen cv_pb env univs t1 t2 = - try + if not Coq_config.bytecode_compiler then + Reduction.generic_conv cv_pb ~l2r:false (fun _ -> None) + full_transparent_state env univs t1 t2 + else + try let v1 = val_of_constr env t1 in let v2 = val_of_constr env t2 in fst (conv_val env cv_pb (nb_rel env) v1 v2 univs) @@ -204,5 +214,3 @@ let vm_conv cv_pb env t1 t2 = if not b then let univs = (univs, checked_universes) in let _ = vm_conv_gen cv_pb env univs t1 t2 in () - -let _ = if Coq_config.bytecode_compiler then Reduction.set_vm_conv vm_conv |