Rename effect to effect_ as it is a reserver keyword in OCaml 5.3 (#9268)

Summary:
Fixes #9267

I don't know if any necessary adjustments need to be made to the documentation. We're changing the names of a few types and some labeled arguments, do the docs need to be updated anywhere?

Also, my editor runs `ocamlformat` when I save a file, so the diff might be larger because of that. Let me know if the formatting changes are unwanted, and I can remove them from the commit.

Pull Request resolved: #9268

Reviewed By: panagosg7

Differential Revision: D71492904

Pulled By: SamChou19815

fbshipit-source-id: 117e80c52194040b7428c0726215c725334f384e

Author: filipeom

src/analysis/env_builder/find_providers.ml

@@ -605,7 +605,7 @@ end = struct
           tparams;
           async = _;
           generator = _;
-          effect = _;
+          effect_ = _;
           sig_loc = _;
           comments = _;
         } =
@@ -881,7 +881,7 @@ end = struct
           tparams;
           async = _;
           generator = _;
-          effect = _;
+          effect_ = _;
           sig_loc = _;
           comments = _;
         } =
@@ -921,7 +921,7 @@ end = struct
           tparams;
           async = _;
           generator = _;
-          effect = _;
+          effect_ = _;
           sig_loc = _;
           comments = _;
         } =

src/analysis/env_builder/name_def.ml

@@ -1135,7 +1135,8 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
 
     method! function_param (loc, _) = fail loc "Should be visited by visit_function_param"
 
-    method private visit_function_param ~hints ~effect (param : ('loc, 'loc) Ast.Function.Param.t) =
+    method private visit_function_param ~hints ~effect_ (param : ('loc, 'loc) Ast.Function.Param.t)
+        =
       let open Ast.Function.Param in
       let (loc, { argument; default = default_expression }) = param in
       let optional =
@@ -1161,7 +1162,7 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
               optional;
               has_default_expression = Base.Option.is_some default_expression;
               react_deep_read_only =
-                ( if effect = Ast.Function.Hook then
+                ( if effect_ = Ast.Function.Hook then
                   Some Hook
                 else
                   None
@@ -1215,7 +1216,7 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
       ignore @@ super#function_param (loc, { argument; default = None })
 
     method private visit_function_rest_param
-        ~hints ~effect (expr : ('loc, 'loc) Ast.Function.RestParam.t) =
+        ~hints ~effect_ (expr : ('loc, 'loc) Ast.Function.RestParam.t) =
       let open Ast.Function.RestParam in
       let (_, { argument; comments = _ }) = expr in
       let (param_loc, _) = argument in
@@ -1228,7 +1229,7 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
               optional = false;
               has_default_expression = false;
               react_deep_read_only =
-                ( if effect = Ast.Function.Hook then
+                ( if effect_ = Ast.Function.Hook then
                   Some Hook
                 else
                   None
@@ -1694,7 +1695,7 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
             body;
             async;
             generator;
-            effect;
+            effect_;
             predicate;
             return;
             tparams = fun_tparams;
@@ -1710,13 +1711,13 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
           Base.List.iteri
             ~f:(fun i ->
               this#visit_function_param
-                ~effect
+                ~effect_
                 ~hints:(decompose_hints (Decomp_FuncParam (param_str_list, i, pred)) func_hints))
             params_list;
           Base.Option.iter
             ~f:
               (this#visit_function_rest_param
-                 ~effect
+                 ~effect_
                  ~hints:(decompose_hints (Decomp_FuncRest (param_str_list, pred)) func_hints)
               )
             rest;

src/analysis/property_assignment.ml

@@ -260,7 +260,7 @@ let eval_property_assignment class_body =
                       params = _;
                       async = _;
                       generator = _;
-                      effect = _;
+                      effect_ = _;
                       predicate = _;
                       return = _;
                       tparams = _;

src/analysis/scope_builder.ml

@@ -787,7 +787,7 @@ module Make (L : Loc_sig.S) (Api : Scope_api_sig.S with module L = L) :
             tparams;
             async = _;
             generator;
-            effect = _;
+            effect_ = _;
             predicate;
             sig_loc = _;
             comments = _;
@@ -840,7 +840,7 @@ module Make (L : Loc_sig.S) (Api : Scope_api_sig.S with module L = L) :
             tparams;
             async = _;
             generator;
-            effect = _;
+            effect_ = _;
             predicate;
             sig_loc = _;
             comments = _;
@@ -906,7 +906,7 @@ module Make (L : Loc_sig.S) (Api : Scope_api_sig.S with module L = L) :
           params = (_, { Params.this_; params = ps; rest = rpo; comments = _ });
           return;
           tparams;
-          effect = _;
+          effect_ = _;
           comments = _;
         } =
           ft

src/common/ty/ty_serializer.ml

@@ -295,14 +295,14 @@ let type_ options =
     let return = fun_return_t f.fun_return in
     let params = fun_params f.fun_params f.fun_rest_param in
     let tparams = Base.Option.map ~f:type_params f.fun_type_params in
-    let effect =
+    let effect_ =
       match f.fun_effect with
       | Ty.Arbitrary -> Ast.Function.Arbitrary
       | Ty.Hook -> Ast.Function.Hook
       | Ty.Parametric n -> Ast.Function.Parametric n
       | Ty.Idempotent -> Ast.Function.Idempotent
     in
-    { T.Function.params; return; tparams; effect; comments = None }
+    { T.Function.params; return; tparams; effect_; comments = None }
   and fun_params params rest_param =
     let params = Base.List.map ~f:fun_param params in
     let rest = Base.Option.map ~f:fun_rest_param rest_param in

src/parser/declaration_parser.ml

@@ -310,11 +310,11 @@ module Declaration (Parse : Parser_common.PARSER) (Type : Parser_common.TYPE) :
   let _function =
     with_loc (fun env ->
         let (async, leading_async) = async env in
-        let (sig_loc, (generator, effect, tparams, id, params, return, predicate, leading)) =
+        let (sig_loc, (generator, effect_, tparams, id, params, return, predicate, leading)) =
           with_loc
             (fun env ->
               let leading_function = Peek.comments env in
-              let (effect, (generator, leading_generator)) =
+              let (effect_, (generator, leading_generator)) =
                 match Peek.token env with
                 | T_FUNCTION ->
                   Eat.token env;
@@ -372,7 +372,7 @@ module Declaration (Parse : Parser_common.PARSER) (Type : Parser_common.TYPE) :
                 | None -> (return_annotation_remove_trailing env return, predicate)
                 | Some _ -> (return, predicate_remove_trailing env predicate)
               in
-              (generator, effect, tparams, id, params, return, predicate, leading))
+              (generator, effect_, tparams, id, params, return, predicate, leading))
             env
         in
         let simple_params = is_simple_parameter_list params in
@@ -386,7 +386,7 @@ module Declaration (Parse : Parser_common.PARSER) (Type : Parser_common.TYPE) :
             params;
             body;
             generator;
-            effect;
+            effect_;
             async;
             predicate;
             return;

src/parser/estree_translator.ml

@@ -426,7 +426,7 @@ with type t = Impl.t = struct
             {
               Function.params = (_, { Function.Params.comments = params_comments; _ }) as params;
               async;
-              effect = _;
+              effect_ = _;
               predicate = predicate_;
               tparams;
               return;
@@ -804,7 +804,7 @@ with type t = Impl.t = struct
             params = (_, { Function.Params.comments = params_comments; _ }) as params;
             async;
             generator;
-            effect;
+            effect_;
             predicate = predicate_;
             tparams;
             return;
@@ -824,7 +824,7 @@ with type t = Impl.t = struct
           ~inner:(format_internal_comments params_comments)
       in
       let (node_name, nonhook_attrs) =
-        if effect = Function.Hook then
+        if effect_ = Function.Hook then
           ("HookDeclaration", [])
         else
           ( "FunctionDeclaration",
@@ -859,7 +859,7 @@ with type t = Impl.t = struct
             params = (_, { Function.Params.comments = params_comments; _ }) as params;
             async;
             generator;
-            effect = _;
+            effect_ = _;
             predicate = predicate_;
             tparams;
             return;
@@ -954,7 +954,7 @@ with type t = Impl.t = struct
       let id_loc = Loc.btwn (fst id) (fst annot) in
       let (name, predicate) =
         match annot with
-        | (_, (_, Type.Function { Type.Function.effect = Function.Hook; _ })) -> ("DeclareHook", [])
+        | (_, (_, Type.Function { Type.Function.effect_ = Function.Hook; _ })) -> ("DeclareHook", [])
         | _ -> ("DeclareFunction", [("predicate", option predicate predicate_)])
       in
       node
@@ -1807,7 +1807,7 @@ with type t = Impl.t = struct
               (_, { Type.Function.Params.this_; params; rest; comments = params_comments });
             return;
             tparams;
-            effect;
+            effect_;
             comments = func_comments;
           }
         ) =
@@ -1817,7 +1817,7 @@ with type t = Impl.t = struct
           ~outer:func_comments
       in
       let name =
-        if effect = Function.Hook then
+        if effect_ = Function.Hook then
           "HookTypeAnnotation"
         else
           "FunctionTypeAnnotation"
@@ -1833,7 +1833,7 @@ with type t = Impl.t = struct
            ("typeParameters", option type_parameter_declaration tparams);
          ]
         @
-        if effect = Function.Hook then
+        if effect_ = Function.Hook then
           []
         else
           [("this", option function_type_this_constraint this_)]

src/parser/expression_parser.ml

@@ -1188,7 +1188,7 @@ module Expression
             params;
             body;
             generator;
-            effect = Function.Arbitrary;
+            effect_ = Function.Arbitrary;
             async;
             predicate;
             return;
@@ -1875,7 +1875,7 @@ module Expression
               async;
               generator = false;
               (* arrow functions cannot be generators *)
-              effect = Function.Arbitrary;
+              effect_ = Function.Arbitrary;
               predicate;
               return;
               tparams;

src/parser/flow_ast.ml

@@ -211,7 +211,7 @@ and Type : sig
       params: ('M, 'T) Params.t;
       return: ('M, 'T) return_annotation;
       comments: ('M, unit) Syntax.t option;
-      effect: Function.effect;
+      effect_: Function.effect_;
     }
 
     and ('M, 'T) return_annotation =
@@ -2377,7 +2377,7 @@ and Function : sig
     [@@deriving show]
   end
 
-  type effect =
+  type effect_ =
     | Hook
     | Arbitrary
     | Idempotent
@@ -2390,7 +2390,7 @@ and Function : sig
     body: ('M, 'T) body;
     async: bool;
     generator: bool;
-    effect: effect;
+    effect_: effect_;
     predicate: ('M, 'T) Type.Predicate.t option;
     return: ('M, 'T) ReturnAnnot.t;
     tparams: ('M, 'T) Type.TypeParams.t option;

src/parser/flow_ast_mapper.ml

@@ -1357,7 +1357,7 @@ class ['loc] mapper =
         return;
         tparams;
         comments = func_comments;
-        effect;
+        effect_;
       } =
         ft
       in
@@ -1387,7 +1387,7 @@ class ['loc] mapper =
           return = return';
           tparams = tparams';
           comments = func_comments';
-          effect;
+          effect_;
         }
 
     method label_identifier (ident : ('loc, 'loc) Ast.Identifier.t) = this#identifier ident
@@ -1982,7 +1982,7 @@ class ['loc] mapper =
         body;
         async;
         generator;
-        effect;
+        effect_;
         predicate;
         return;
         tparams;
@@ -2016,7 +2016,7 @@ class ['loc] mapper =
           body = body';
           async;
           generator;
-          effect;
+          effect_;
           predicate = predicate';
           tparams = tparams';
           sig_loc;

src/parser/object_parser.ml

@@ -179,7 +179,7 @@ module Object
             body;
             generator;
             async;
-            effect = Function.Arbitrary;
+            effect_ = Function.Arbitrary;
             predicate = None;
             (* setters/getter are not predicates *)
             return;
@@ -274,7 +274,7 @@ module Object
               params;
               body;
               generator;
-              effect = Function.Arbitrary;
+              effect_ = Function.Arbitrary;
               async;
               (* TODO: add support for object method predicates *)
               predicate = None;
@@ -850,7 +850,7 @@ module Object
                 body;
                 generator;
                 async;
-                effect = Function.Arbitrary;
+                effect_ = Function.Arbitrary;
                 (* TODO: add support for method predicates *)
                 predicate = None;
                 return;

src/parser/statement_parser.ml

@@ -1211,7 +1211,7 @@ module Statement
 
   and declare_function ~async ?(leading = []) env =
     let leading = leading @ Peek.comments env in
-    let effect =
+    let effect_ =
       match Peek.token env with
       | T_FUNCTION ->
         Eat.token env;
@@ -1232,18 +1232,18 @@ module Statement
           Expect.token env T_COLON;
           Eat.push_lex_mode env Lex_mode.TYPE;
           let return =
-            if is_start_of_type_guard env && effect <> Function.Hook then
+            if is_start_of_type_guard env && effect_ <> Function.Hook then
               Ast.Type.Function.TypeGuard (Type.type_guard env)
             else
               let return = Type._type env in
               let has_predicate = Peek.token env = T_CHECKS in
-              if has_predicate && effect <> Function.Hook then
+              if has_predicate && effect_ <> Function.Hook then
                 Ast.Type.Function.TypeAnnotation (type_remove_trailing env return)
               else
                 Ast.Type.Function.TypeAnnotation return
           in
           Eat.pop_lex_mode env;
-          Ast.Type.(Function { Function.params; return; tparams; comments = None; effect }))
+          Ast.Type.(Function { Function.params; return; tparams; comments = None; effect_ }))
         env
     in
     let predicate = Type.predicate_opt env in