continue shaking env argument

Author: bobzhang

jscomp/core/lam_compile_main.ml

@@ -215,7 +215,7 @@ let compile
         Ext_filename.new_extension !Location.input_name  ".lambda" in
       Ext_fmt.with_file_as_pp f begin fun fmt ->
         Format.pp_print_list ~pp_sep:Format.pp_print_newline
-          (Lam_group.pp_group env) fmt (coerced_input.groups) 
+          Lam_group.pp_group  fmt (coerced_input.groups) 
       end;
   in
 #end  

jscomp/core/lam_group.ml

@@ -54,17 +54,17 @@ let str_of_kind (kind : Lam_compat.let_kind) =
   | StrictOpt -> "o"
   | Variable -> "v"
 
-let pp_group env fmt ( x : t) =
+let pp_group fmt ( x : t) =
   match x with
   | Single (kind, id, lam) ->
     Format.fprintf fmt "@[let@ %a@ =%s@ @[<hv>%a@]@ @]" Ident.print id (str_of_kind kind)
-      (Lam_print.env_lambda env) lam
+      Lam_print.lambda lam
   | Recursive lst ->
     List.iter (fun (id,lam) ->
         Format.fprintf fmt
-          "@[let %a@ =r@ %a@ @]" Ident.print id (Lam_print.env_lambda env) lam
+          "@[let %a@ =r@ %a@ @]" Ident.print id Lam_print.lambda lam
       ) lst
-  | Nop lam -> Lam_print.env_lambda env fmt lam
+  | Nop lam -> Lam_print.lambda fmt lam
 
 
 

jscomp/core/lam_group.mli

@@ -38,7 +38,10 @@ type t =
 
 (** Tricky to be complete *)
 
-val pp_group : Env.t -> Format.formatter -> t -> unit
+val pp_group : 
+  Format.formatter -> 
+  t -> 
+  unit
 
 val single :
   Lam_compat.let_kind ->

jscomp/core/lam_print.ml

@@ -398,7 +398,7 @@ let get_string ((id : Ident.t), (pos : int)) (env : Env.t) : string =
 
 
 
-let lambda use_env env ppf v  =
+let lambda ppf v  =
   let rec lam ppf (l : Lam.t) = match l with 
     | Lvar id ->
       Ident.print ppf id
@@ -437,18 +437,10 @@ let lambda use_env env ppf v  =
         "@[<2>(let@ (@[<hv 1>%a@]" bindings (List.rev args);
       fprintf ppf ")@ %a)@]"  lam body
     | Lprim { 
-        primitive = Pfield (n,_); 
+        primitive = Pfield (n,Fld_module s); 
         args = [ Lglobal_module id ]
-        ;  _} when use_env ->
-      fprintf ppf "%s.%s/%d" id.name (get_string (id,n) env) n
-
-    | Lprim { 
-        primitive  = Psetfield (n,_); 
-        args = [ Lglobal_module id  ;
-                 e ]
-        ;  _} when use_env  ->
-      fprintf ppf "@[<2>(%s.%s/%d <- %a)@]" id.name (get_string (id,n) env) n
-        lam e
+        ;  _} ->
+      fprintf ppf "%s.%s/%d" id.name s n
     | Lprim{primitive = prim; args = largs;  _} ->
       let lams ppf largs =
         List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
@@ -540,8 +532,6 @@ let lambda use_env env ppf v  =
 
 let structured_constant = struct_const
 
-let env_lambda = lambda true 
-let lambda = lambda false Env.empty
 
 let rec flatten_seq acc (lam : Lam.t) =
   match lam with 
@@ -579,10 +569,10 @@ let lambda_as_module env  ppf (lam : Lam.t) =
           (fun (left, l) ->
              match left with 
              | Id { kind = k; id } ->
-               fprintf ppf "@[<2>%a =%s@ %a@]@." Ident.print id (kind k) (env_lambda env) l
+               fprintf ppf "@[<2>%a =%s@ %a@]@." Ident.print id (kind k) lambda l
              | Nop -> 
 
-               fprintf ppf "@[<2>%a@]@."   (env_lambda env) l
+               fprintf ppf "@[<2>%a@]@."  lambda l
           )
 
         @@ List.rev rest
@@ -592,7 +582,7 @@ let lambda_as_module env  ppf (lam : Lam.t) =
     end
   (* | _ -> raise Not_a_module *)
   with _ -> 
-    env_lambda env ppf lam;
+    lambda ppf lam;
     fprintf ppf "; lambda-failure"
 
 let seriaize (filename : string) (lam : Lam.t) : unit =

jscomp/core/lam_print.mli

@@ -26,10 +26,6 @@ val lambda : Format.formatter -> Lam.t -> unit
 
 val primitive: Format.formatter -> Lam_primitive.t -> unit
 
-
-
-val env_lambda : Env.t -> Format.formatter -> Lam.t -> unit
-
 val seriaize :  string -> Lam.t -> unit
 
 val lambda_to_string : Lam.t -> string 

lib/4.02.3/unstable/js_compiler.ml

@@ -75303,10 +75303,6 @@ val lambda : Format.formatter -> Lam.t -> unit
 
 val primitive: Format.formatter -> Lam_primitive.t -> unit
 
-
-
-val env_lambda : Env.t -> Format.formatter -> Lam.t -> unit
-
 val seriaize :  string -> Lam.t -> unit
 
 val lambda_to_string : Lam.t -> string 
@@ -75706,7 +75702,7 @@ let get_string ((id : Ident.t), (pos : int)) (env : Env.t) : string =
 
 
 
-let lambda use_env env ppf v  =
+let lambda ppf v  =
   let rec lam ppf (l : Lam.t) = match l with 
     | Lvar id ->
       Ident.print ppf id
@@ -75745,18 +75741,10 @@ let lambda use_env env ppf v  =
         "@[<2>(let@ (@[<hv 1>%a@]" bindings (List.rev args);
       fprintf ppf ")@ %a)@]"  lam body
     | Lprim { 
-        primitive = Pfield (n,_); 
+        primitive = Pfield (n,Fld_module s); 
         args = [ Lglobal_module id ]
-        ;  _} when use_env ->
-      fprintf ppf "%s.%s/%d" id.name (get_string (id,n) env) n
-
-    | Lprim { 
-        primitive  = Psetfield (n,_); 
-        args = [ Lglobal_module id  ;
-                 e ]
-        ;  _} when use_env  ->
-      fprintf ppf "@[<2>(%s.%s/%d <- %a)@]" id.name (get_string (id,n) env) n
-        lam e
+        ;  _} ->
+      fprintf ppf "%s.%s/%d" id.name s n
     | Lprim{primitive = prim; args = largs;  _} ->
       let lams ppf largs =
         List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
@@ -75848,8 +75836,6 @@ let lambda use_env env ppf v  =
 
 let structured_constant = struct_const
 
-let env_lambda = lambda true 
-let lambda = lambda false Env.empty
 
 let rec flatten_seq acc (lam : Lam.t) =
   match lam with 
@@ -75887,10 +75873,10 @@ let lambda_as_module env  ppf (lam : Lam.t) =
           (fun (left, l) ->
              match left with 
              | Id { kind = k; id } ->
-               fprintf ppf "@[<2>%a =%s@ %a@]@." Ident.print id (kind k) (env_lambda env) l
+               fprintf ppf "@[<2>%a =%s@ %a@]@." Ident.print id (kind k) lambda l
              | Nop -> 
 
-               fprintf ppf "@[<2>%a@]@."   (env_lambda env) l
+               fprintf ppf "@[<2>%a@]@."  lambda l
           )
 
         @@ List.rev rest
@@ -75900,7 +75886,7 @@ let lambda_as_module env  ppf (lam : Lam.t) =
     end
   (* | _ -> raise Not_a_module *)
   with _ -> 
-    env_lambda env ppf lam;
+    lambda ppf lam;
     fprintf ppf "; lambda-failure"
 
 let seriaize (filename : string) (lam : Lam.t) : unit =
@@ -101312,7 +101298,10 @@ type t =
 
 (** Tricky to be complete *)
 
-val pp_group : Env.t -> Format.formatter -> t -> unit
+val pp_group : 
+  Format.formatter -> 
+  t -> 
+  unit
 
 val single :
   Lam_compat.let_kind ->
@@ -101383,17 +101372,17 @@ let str_of_kind (kind : Lam_compat.let_kind) =
   | StrictOpt -> "o"
   | Variable -> "v"
 
-let pp_group env fmt ( x : t) =
+let pp_group fmt ( x : t) =
   match x with
   | Single (kind, id, lam) ->
     Format.fprintf fmt "@[let@ %a@ =%s@ @[<hv>%a@]@ @]" Ident.print id (str_of_kind kind)
-      (Lam_print.env_lambda env) lam
+      Lam_print.lambda lam
   | Recursive lst ->
     List.iter (fun (id,lam) ->
         Format.fprintf fmt
-          "@[let %a@ =r@ %a@ @]" Ident.print id (Lam_print.env_lambda env) lam
+          "@[let %a@ =r@ %a@ @]" Ident.print id Lam_print.lambda lam
       ) lst
-  | Nop lam -> Lam_print.env_lambda env fmt lam
+  | Nop lam -> Lam_print.lambda fmt lam
 
 
 

lib/4.02.3/whole_compiler.ml

@@ -66876,10 +66876,6 @@ val lambda : Format.formatter -> Lam.t -> unit
 
 val primitive: Format.formatter -> Lam_primitive.t -> unit
 
-
-
-val env_lambda : Env.t -> Format.formatter -> Lam.t -> unit
-
 val seriaize :  string -> Lam.t -> unit
 
 val lambda_to_string : Lam.t -> string 
@@ -67279,7 +67275,7 @@ let get_string ((id : Ident.t), (pos : int)) (env : Env.t) : string =
 
 
 
-let lambda use_env env ppf v  =
+let lambda ppf v  =
   let rec lam ppf (l : Lam.t) = match l with 
     | Lvar id ->
       Ident.print ppf id
@@ -67318,18 +67314,10 @@ let lambda use_env env ppf v  =
         "@[<2>(let@ (@[<hv 1>%a@]" bindings (List.rev args);
       fprintf ppf ")@ %a)@]"  lam body
     | Lprim { 
-        primitive = Pfield (n,_); 
+        primitive = Pfield (n,Fld_module s); 
         args = [ Lglobal_module id ]
-        ;  _} when use_env ->
-      fprintf ppf "%s.%s/%d" id.name (get_string (id,n) env) n
-
-    | Lprim { 
-        primitive  = Psetfield (n,_); 
-        args = [ Lglobal_module id  ;
-                 e ]
-        ;  _} when use_env  ->
-      fprintf ppf "@[<2>(%s.%s/%d <- %a)@]" id.name (get_string (id,n) env) n
-        lam e
+        ;  _} ->
+      fprintf ppf "%s.%s/%d" id.name s n
     | Lprim{primitive = prim; args = largs;  _} ->
       let lams ppf largs =
         List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
@@ -67421,8 +67409,6 @@ let lambda use_env env ppf v  =
 
 let structured_constant = struct_const
 
-let env_lambda = lambda true 
-let lambda = lambda false Env.empty
 
 let rec flatten_seq acc (lam : Lam.t) =
   match lam with 
@@ -67460,10 +67446,10 @@ let lambda_as_module env  ppf (lam : Lam.t) =
           (fun (left, l) ->
              match left with 
              | Id { kind = k; id } ->
-               fprintf ppf "@[<2>%a =%s@ %a@]@." Ident.print id (kind k) (env_lambda env) l
+               fprintf ppf "@[<2>%a =%s@ %a@]@." Ident.print id (kind k) lambda l
              | Nop -> 
 
-               fprintf ppf "@[<2>%a@]@."   (env_lambda env) l
+               fprintf ppf "@[<2>%a@]@."  lambda l
           )
 
         @@ List.rev rest
@@ -67473,7 +67459,7 @@ let lambda_as_module env  ppf (lam : Lam.t) =
     end
   (* | _ -> raise Not_a_module *)
   with _ -> 
-    env_lambda env ppf lam;
+    lambda ppf lam;
     fprintf ppf "; lambda-failure"
 
 let seriaize (filename : string) (lam : Lam.t) : unit =
@@ -91941,7 +91927,10 @@ type t =
 
 (** Tricky to be complete *)
 
-val pp_group : Env.t -> Format.formatter -> t -> unit
+val pp_group : 
+  Format.formatter -> 
+  t -> 
+  unit
 
 val single :
   Lam_compat.let_kind ->
@@ -92012,17 +92001,17 @@ let str_of_kind (kind : Lam_compat.let_kind) =
   | StrictOpt -> "o"
   | Variable -> "v"
 
-let pp_group env fmt ( x : t) =
+let pp_group fmt ( x : t) =
   match x with
   | Single (kind, id, lam) ->
     Format.fprintf fmt "@[let@ %a@ =%s@ @[<hv>%a@]@ @]" Ident.print id (str_of_kind kind)
-      (Lam_print.env_lambda env) lam
+      Lam_print.lambda lam
   | Recursive lst ->
     List.iter (fun (id,lam) ->
         Format.fprintf fmt
-          "@[let %a@ =r@ %a@ @]" Ident.print id (Lam_print.env_lambda env) lam
+          "@[let %a@ =r@ %a@ @]" Ident.print id Lam_print.lambda lam
       ) lst
-  | Nop lam -> Lam_print.env_lambda env fmt lam
+  | Nop lam -> Lam_print.lambda fmt lam