"effect" is a reserved word now

Author: cknitt

compiler/core/js_cmj_format.ml

@@ -33,7 +33,7 @@ type cmj_value = {
       (** Either constant or closed functor *)
 }
 
-type effect = string option
+type effect_ = string option
 
 let single_na = Single Lam_arity.na
 
@@ -52,7 +52,7 @@ type t = {
   case: Ext_js_file_kind.case;
 }
 
-let make ~(values : cmj_value Map_string.t) ~effect ~package_spec ~case : t =
+let make ~(values : cmj_value Map_string.t) ~effect_ ~package_spec ~case : t =
   {
     values =
       Map_string.to_sorted_array_with_f values (fun k v ->
@@ -61,7 +61,7 @@ let make ~(values : cmj_value Map_string.t) ~effect ~package_spec ~case : t =
             arity = v.arity;
             persistent_closed_lambda = v.persistent_closed_lambda;
           });
-    pure = effect = None;
+    pure = effect_ = None;
     package_spec;
     case;
   }

compiler/core/js_cmj_format.mli

@@ -52,7 +52,7 @@ type cmj_value = {
   persistent_closed_lambda: Lam.t option; (* Either constant or closed functor *)
 }
 
-type effect = string option
+type effect_ = string option
 
 type keyed_cmj_value = {
   name: string;
@@ -69,7 +69,7 @@ type t = {
 
 val make :
   values:cmj_value Map_string.t ->
-  effect:effect ->
+  effect_:effect_ ->
   package_spec:Js_packages_info.t ->
   case:Ext_js_file_kind.case ->
   t

compiler/core/lam_compile_main.ml

@@ -266,21 +266,21 @@ js
           ) 
     in
     Warnings.check_fatal();
-    let effect = 
+    let effect_ = 
       Lam_stats_export.get_dependent_module_effect
         maybe_pure external_module_ids in 
     let v : Js_cmj_format.t = 
       Lam_stats_export.export_to_cmj 
         meta  
-        effect 
+        effect_ 
         coerced_input.export_map          
         (if Ext_char.is_lower_case (Filename.basename output_prefix).[0] then Little else Upper)
     in
     (if not !Clflags.dont_write_files then
        Js_cmj_format.to_file 
          ~check_exists:(not !Js_config.force_cmj)
          (output_prefix ^ Literals.suffix_cmj) v);
-    {J.program = program ; side_effect = effect ; modules = external_module_ids }      
+    {J.program = program ; side_effect = effect_ ; modules = external_module_ids }      
   )
 ;;
 

compiler/core/lam_stats_export.ml

@@ -128,11 +128,11 @@ let get_dependent_module_effect (maybe_pure : string option)
    ]}
    TODO: check that we don't do this in browser environment
 *)
-let export_to_cmj (meta : Lam_stats.t) effect export_map case : Js_cmj_format.t
+let export_to_cmj (meta : Lam_stats.t) effect_ export_map case : Js_cmj_format.t
     =
   let values = values_of_export meta export_map in
 
-  Js_cmj_format.make ~values ~effect
+  Js_cmj_format.make ~values ~effect_
     ~package_spec:(Js_packages_state.get_packages_info ())
     ~case
 (* FIXME: make sure [-o] would not change its case

compiler/core/lam_stats_export.mli

@@ -27,7 +27,7 @@ val get_dependent_module_effect :
 
 val export_to_cmj :
   Lam_stats.t ->
-  Js_cmj_format.effect ->
+  Js_cmj_format.effect_ ->
   Lam.t Map_ident.t ->
   Ext_js_file_kind.case ->
   Js_cmj_format.t