diff options
author | Maxime Dénès <mail@maximedenes.fr> | 2016-07-03 18:54:06 +0200 |
---|---|---|
committer | Maxime Dénès <mail@maximedenes.fr> | 2016-07-03 18:54:06 +0200 |
commit | e278d031a1d9a7bf3de463d3d415065299c99395 (patch) | |
tree | ddd3a123e1887a9fa4634af7559bc7bb67b0cc25 /tools/coqmktop.ml | |
parent | d7664c0530edd196d52e9fd8a4b925dbfefd1b9b (diff) | |
parent | 3ce70f21a18cc19e720e8ac54b93652527881942 (diff) |
Merge branch 'cerrors-cclosure' into trunk
Was PR#226: CErrors & CClosure
Diffstat (limited to 'tools/coqmktop.ml')
-rw-r--r-- | tools/coqmktop.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/coqmktop.ml b/tools/coqmktop.ml index 6f3d8e2b8..eaf938e8c 100644 --- a/tools/coqmktop.ml +++ b/tools/coqmktop.ml @@ -235,7 +235,7 @@ let declare_loading_string () = \n Mltop.set_top\ \n {Mltop.load_obj=\ \n (fun f -> if not (Topdirs.load_file ppf f)\ -\n then Errors.error (\"Could not load plugin \"^f));\ +\n then CErrors.error (\"Could not load plugin \"^f));\ \n Mltop.use_file=Topdirs.dir_use ppf;\ \n Mltop.add_dir=Topdirs.dir_directory;\ \n Mltop.ml_loop=(fun () -> Toploop.loop ppf) };;\ @@ -265,7 +265,7 @@ let create_tmp_main_file modules = let main () = let (options, userfiles) = parse_args () in (* Directories: *) - let () = Envars.set_coqlib ~fail:Errors.error in + let () = Envars.set_coqlib ~fail:CErrors.error in let basedir = if !Flags.boot then None else Some (Envars.coqlib ()) in (* Which ocaml compiler to invoke *) let prog = if !opt then "opt" else "ocamlc" in |