diff options
| author | Xavier Clerc <xavier.clerc@inria.fr> | 2012-07-09 12:40:43 +0000 |
|---|---|---|
| committer | Xavier Clerc <xavier.clerc@inria.fr> | 2012-07-09 12:40:43 +0000 |
| commit | fa0e0b6ba740c13798ea7306ece93a590c84fff4 (patch) | |
| tree | 379829c7f5b91dc350b7578916ee16de986da2cc | |
| parent | 61ff6edc274f07a9ae70138e77d4958d0ac3b928 (diff) | |
| download | ocaml-fa0e0b6ba740c13798ea7306ece93a590c84fff4.tar.gz | |
PR#5647: Cannot use install_printer in debugger
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12672 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | debugger/loadprinter.ml | 9 |
2 files changed, 10 insertions, 0 deletions
@@ -159,6 +159,7 @@ Bug Fixes: - PR#5620: invalid printing of type manifest (camlp4 revised syntax) - PR#5637: invalid printing of anonymous type parameters (camlp4 revised syntax) - PR#5643: issues with .cfi and .loc directives generated by ocamlopt -g +- PR#5647: Cannot use install_printer in debugger - PR#5651: printer for abstract data type (camlp4 revised syntax) - PR#5655: ocamlbuild doesn't pass cflags when building C stubs - PR#5661: fixes for the test suite diff --git a/debugger/loadprinter.ml b/debugger/loadprinter.ml index 0395cfb307..1c0427a9c5 100644 --- a/debugger/loadprinter.ml +++ b/debugger/loadprinter.ml @@ -95,6 +95,15 @@ let rec eval_path = function (* Install, remove a printer (as in toplevel/topdirs) *) +(* since 4.00, "topdirs.cmi" is not in the same directory as the standard + libray, so we load it beforehand as it cannot be found in the search path. *) +let () = + let compiler_libs = + Filename.concat Config.standard_library "compiler-libs" in + let topdirs = + Filename.concat compiler_libs "topdirs.cmi" in + ignore (Env.read_signature "Topdirs" topdirs) + let match_printer_type desc typename = let (printer_type, _) = try |