Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Code: add directives #load and #install_printer

  • Loading branch information...
commit 9a6a2578aa3909bc6fc1cf46c7a050f69b231c9b 1 parent b61e187
@Chris00 Chris00 authored
Showing with 1 addition and 11 deletions.
  1. +0 −1  .gitignore
  2. +0 −1  _oasis
  3. +1 −7 src/app/code.ml
  4. +0 −2  src/app/conf.ml.ab
View
1  .gitignore
@@ -13,5 +13,4 @@ src/lib/META
src/lib/ocamlorg.mllib
src/lib/doclib.odocl
www/
-src/app/conf.ml
View
1  _oasis
@@ -7,7 +7,6 @@ Authors: Christophe Troestler, Esther Baruk, Ashish Agarwal
License: LGPL-3.0 with OCaml linking exception
Plugins: META (0.3)
BuildTools: ocamlbuild
-FilesAB: src/app/conf.ml.ab
Library ocamlorg
Path: src/lib
View
8 src/app/code.ml
@@ -97,13 +97,7 @@ let () =
Toploop.input_name := ""; (* no filename *)
Toploop.max_printer_steps := 20;
(* Add #load and #install_printer *)
- let load cma =
- Dynlink.allow_unsafe_modules true;
- let cma = Filename.(if is_relative cma then concat Conf.standard_library cma
- else cma) in
- try Dynlink.loadfile (Dynlink.adapt_filename cma)
- with Dynlink.Error e ->
- eprintf "#load %S: %s\n" cma (Dynlink.error_message e) in
+ let load cma = Topdirs.dir_load Format.str_formatter cma in
Toploop.(Hashtbl.add directive_table "load" (Directive_string load))
type outcome =
View
2  src/app/conf.ml.ab
@@ -1,2 +0,0 @@
-
-let standard_library = "$(standard_library)"
Please sign in to comment.
Something went wrong with that request. Please try again.