Commits

Anonymous committed 2f9eb4d

Remove dependency from typing/envaux.ml to bytecomp/instruct.ml

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12793f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

  • Participants
  • Parent commits e34a677

Comments (0)

Files changed (4)

 include stdlib/StdlibModules
 
 CAMLC=boot/ocamlrun boot/ocamlc -nostdlib -I boot
-CAMLOPT=boot/ocamlrun ./ocamlopt -nostdlib -I stdlib -I otherlibs/dynlink
+CAMLOPT=boot/ocamlrun ./ocamlopt -g -nostdlib -I stdlib -I otherlibs/dynlink
 COMPFLAGS=-strict-sequence -w +33..39 -warn-error A $(INCLUDES)
 LINKFLAGS=
 

debugger/command_line.ml

     Eval.report_error ppf msg;
     raise Toplevel
 
+let env_of_event =
+  function
+    None    -> Env.empty
+  | Some ev -> Envaux.env_from_summary ev.Instruct.ev_typenv ev.Instruct.ev_typsubst
+
 let print_command depth ppf lexbuf =
   let exprs = expression_list_eol Lexer.lexeme lexbuf in
   ensure_loaded ();
   let env =
     try
-      Envaux.env_of_event !selected_event
+      env_of_event !selected_event
     with
     | Envaux.Error msg ->
         Envaux.report_error ppf msg;
     | BA_function expr ->                       (* break FUNCTION *)
         let env =
           try
-            Envaux.env_of_event !selected_event
+            env_of_event !selected_event
           with
           | Envaux.Error msg ->
               Envaux.report_error ppf msg;
       Hashtbl.add env_cache (sum, subst) env;
       env
 
-let env_of_event =
-  function
-    None    -> Env.empty
-  | Some ev -> env_from_summary ev.Instruct.ev_typenv ev.Instruct.ev_typsubst
-
 let env_of_only_summary env =
   Env.env_of_only_summary env_from_summary env
 

typing/envaux.mli

 
 (* Convert environment summaries to environments *)
 
-val env_of_event: Instruct.debug_event option -> Env.t
+val env_from_summary : Env.summary -> Subst.t -> Env.t
 
 (* Empty the environment caches. To be called when load_path changes. *)