Merge branch 'master' into abstract_local_env

lib/sasalib/sasaRun.ml

@@ -136,7 +136,7 @@ let (make_do: string array -> SasArg.t ->
         in
         (* 3: Do the steps *)
         let ne = Sasa.do_step pnal e in
-        let sasa_nenv = from_sasa_env pl_n ne in
+        let sasa_nenv = from_sasa_env pl_n e in
         sasa_env := ne;
         sasa_nenv @ (get_sl_out true pl enab_ll) @
         (get_sl_out false pl activate_val) 
@@ -146,13 +146,7 @@ let (make_do: string array -> SasArg.t ->
     let step_dbg sl_in ctx cont = cont (step sl_in) ctx in
 (*
    this event is useless actually; the same information is available at Rtop
-      {
-        Event.nb = ctx.Event.nb;
-        Event.step  = ctx.Event.step;
-        Event.depth = ctx.Event.depth;
-        Event.data  = ctx.Event.data;
-        Event.terminate = ctx.Event.terminate;
-
+      { ctx with
         Event.kind = Event.Exit;
         Event.lang = "sasa";
         Event.sinfo = None;