diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2014-05-02 06:19:55 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2014-05-02 06:19:55 +0000 |
| commit | 95104b392443a02c733c3354db7062761e5a1a9c (patch) | |
| tree | 09c691c974516f85b1ac2086281b387004c775a9 /toplevel | |
| parent | 9baf42b72da71213f483e3cc3b9ed9088cdf76ff (diff) | |
| download | ocaml-95104b392443a02c733c3354db7062761e5a1a9c.tar.gz | |
revert commit 14719
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14723 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/expunge.ml | 2 | ||||
| -rw-r--r-- | toplevel/topdirs.ml | 7 | ||||
| -rw-r--r-- | toplevel/toploop.ml | 8 |
3 files changed, 4 insertions, 13 deletions
diff --git a/toplevel/expunge.ml b/toplevel/expunge.ml index a893c60ddc..fa6fd7ca5a 100644 --- a/toplevel/expunge.ml +++ b/toplevel/expunge.ml @@ -65,7 +65,7 @@ let main () = let global_map = (input_value ic : Symtable.global_map) in output_value oc (expunge_map global_map) | "CRCS" -> - let crcs = (input_value ic : (string * Digest.t option) list) in + let crcs = (input_value ic : (string * Digest.t) list) in output_value oc (expunge_crcs crcs) | _ -> copy_file_chunk ic oc len diff --git a/toplevel/topdirs.ml b/toplevel/topdirs.ml index d4447308aa..f9d383380e 100644 --- a/toplevel/topdirs.ml +++ b/toplevel/topdirs.ml @@ -61,12 +61,7 @@ exception Load_failed let check_consistency ppf filename cu = try List.iter - (fun (name, crco) -> - Env.imported_units := name :: !Env.imported_units; - match crco with - None -> () - | Some crc-> - Consistbl.check Env.crc_units name crc filename) + (fun (name, crc) -> Consistbl.check Env.crc_units name crc filename) cu.cu_imports with Consistbl.Inconsistency(name, user, auth) -> fprintf ppf "@[<hv 0>The files %s@ and %s@ \ diff --git a/toplevel/toploop.ml b/toplevel/toploop.ml index ea30bf52ed..e991ee6490 100644 --- a/toplevel/toploop.ml +++ b/toplevel/toploop.ml @@ -424,12 +424,8 @@ let _ = let crc_intfs = Symtable.init_toplevel() in Compmisc.init_path false; List.iter - (fun (name, crco) -> - Env.imported_units := name :: !Env.imported_units; - match crco with - None -> () - | Some crc-> - Consistbl.set Env.crc_units name crc Sys.executable_name) + (fun (name, crc) -> + Consistbl.set Env.crc_units name crc Sys.executable_name) crc_intfs let load_ocamlinit ppf = |