Rename Callable -> Target [1/n] rename module

Summary:
We decided recently to rename many of the interprocedural
modules to better reflect what they actually do, and also
minimize collisions with `Analysis` module names.

The one rename that we decided made sense but we put off at first was `Callable
-> Target`... this rename is desirable because (a) we already have non-callable
targets in taint and (b) there's an open wish-list item to allow tracking taint
through attributes.  But it will take quite a while to rename all the various
functions and variables that have `callable` in the name.

This is the first commit of a rename, and by far the biggest bulk commit we
need to make, it renames the module without changing anything else. After we
land this, I can go through this change line-by-line as well as use code search
to identify variables and functions that need renames in much smaller follow-up
diffs.

Reviewed By: grievejia

Differential Revision: D30184905

fbshipit-source-id: f5cedb9da53fa3e0280a1c857f339f6c7271fd1d

Author: stroxler

source/command/analyzeCommand.ml

@@ -167,8 +167,8 @@ let run_analysis
               ~environment:(Analysis.TypeEnvironment.read_only environment)
               ~functions:
                 (List.map callables_with_dependency_information ~f:fst
-                  :> Interprocedural.Callable.t list)
-              ~stubs:(stubs :> Interprocedural.Callable.t list)
+                  :> Interprocedural.Target.t list)
+              ~stubs:(stubs :> Interprocedural.Target.t list)
           in
 
           let environment, initial_callables =

source/command/inferCommand.ml

@@ -138,7 +138,7 @@ let run_infer_interprocedural
             ~environment
             ~qualifiers
             ~initial_callables
-            ~initial_models:Interprocedural.Callable.Map.empty
+            ~initial_models:Interprocedural.Target.Map.empty
             ~skip_overrides:Ast.Reference.Set.empty
             ();
           let { Caml.Gc.minor_collections; major_collections; compactions; _ } = Caml.Gc.stat () in

source/command/newInferCommand.ml

@@ -293,7 +293,7 @@ let run_infer_interprocedural ~configuration ~build_system () =
             ~environment
             ~qualifiers
             ~initial_callables
-            ~initial_models:Interprocedural.Callable.Map.empty
+            ~initial_models:Interprocedural.Target.Map.empty
             ~skip_overrides:Ast.Reference.Set.empty
             ()));
   Lwt.return ExitStatus.Ok

source/interprocedural/analysisResult.ml

@@ -74,7 +74,7 @@ type 'part pkg =
 
 module InitializedModels = struct
   type 'call_model initialize_result = {
-    initial_models: 'call_model Callable.Map.t;
+    initial_models: 'call_model Target.Map.t;
     skip_overrides: Ast.Reference.Set.t;
   }
 
@@ -85,7 +85,7 @@ module InitializedModels = struct
 
   let empty =
     create (fun ~updated_environment:_ ->
-        { initial_models = Callable.Map.empty; skip_overrides = Ast.Reference.Set.empty })
+        { initial_models = Target.Map.empty; skip_overrides = Ast.Reference.Set.empty })
 
 
   let get_models f = f ~updated_environment:None
@@ -102,7 +102,7 @@ module type ANALYZER = sig
 
   val analyze
     :  environment:Analysis.TypeEnvironment.ReadOnly.t ->
-    callable:Callable.real_target ->
+    callable:Target.real_target ->
     qualifier:Reference.t ->
     define:Define.t Node.t ->
     existing:call_model option ->
@@ -118,16 +118,16 @@ module type ANALYZER = sig
     :  scheduler:Scheduler.t ->
     static_analysis_configuration:Configuration.StaticAnalysis.t ->
     environment:Analysis.TypeEnvironment.ReadOnly.t ->
-    functions:Callable.t list ->
-    stubs:Callable.t list ->
+    functions:Target.t list ->
+    stubs:Target.t list ->
     call_model InitializedModels.t
 
   val report
     :  scheduler:Scheduler.t ->
     static_analysis_configuration:Configuration.StaticAnalysis.t ->
     environment:Analysis.TypeEnvironment.ReadOnly.t ->
     filename_lookup:(Ast.Reference.t -> string option) ->
-    callables:Callable.Set.t ->
+    callables:Target.Set.t ->
     skipped_overrides:Ast.Reference.t list ->
     fixpoint_timer:Timer.t ->
     fixpoint_iterations:int option ->

source/interprocedural/analysisResult.mli

@@ -85,7 +85,7 @@ module InitializedModels : sig
   type 'call_model t
 
   type 'call_model initialize_result = {
-    initial_models: 'call_model Callable.Map.t;
+    initial_models: 'call_model Target.Map.t;
     skip_overrides: Ast.Reference.Set.t;
   }
 
@@ -114,7 +114,7 @@ module type ANALYZER = sig
 
   val analyze
     :  environment:Analysis.TypeEnvironment.ReadOnly.t ->
-    callable:Callable.real_target ->
+    callable:Target.real_target ->
     qualifier:Reference.t ->
     define:Statement.Define.t Node.t ->
     existing:call_model option ->
@@ -130,16 +130,16 @@ module type ANALYZER = sig
     :  scheduler:Scheduler.t ->
     static_analysis_configuration:Configuration.StaticAnalysis.t ->
     environment:Analysis.TypeEnvironment.ReadOnly.t ->
-    functions:Callable.t list ->
-    stubs:Callable.t list ->
+    functions:Target.t list ->
+    stubs:Target.t list ->
     call_model InitializedModels.t
 
   val report
     :  scheduler:Scheduler.t ->
     static_analysis_configuration:Configuration.StaticAnalysis.t ->
     environment:Analysis.TypeEnvironment.ReadOnly.t ->
     filename_lookup:(Ast.Reference.t -> string option) ->
-    callables:Callable.Set.t ->
+    callables:Target.Set.t ->
     skipped_overrides:Ast.Reference.t list ->
     fixpoint_timer:Timer.t ->
     fixpoint_iterations:int option ->

source/interprocedural/callGraph.ml

@@ -15,14 +15,14 @@ open Pyre
 type regular_targets = {
   implicit_self: bool;
   collapse_tito: bool;
-  targets: Callable.t list;
+  targets: Target.t list;
 }
 [@@deriving eq, show { with_path = false }]
 
 type raw_callees =
   | ConstructorTargets of {
-      new_targets: Callable.t list;
-      init_targets: Callable.t list;
+      new_targets: Target.t list;
+      init_targets: Target.t list;
     }
   | RegularTargets of regular_targets
   | HigherOrderTargets of {
@@ -218,9 +218,9 @@ let compute_indirect_targets ~resolution ~receiver_type implementation_target =
   let get_class_type = GlobalResolution.parse_reference global_resolution in
   let get_actual_target method_name =
     if DependencyGraphSharedMemory.overrides_exist method_name then
-      Callable.create_override method_name
+      Target.create_override method_name
     else
-      Callable.create_method method_name
+      Target.create_method method_name
   in
   let receiver_type = receiver_type |> strip_meta |> strip_optional |> Type.weaken_literals in
   let declaring_type = Reference.prefix implementation_target in
@@ -231,7 +231,7 @@ let compute_indirect_targets ~resolution ~receiver_type implementation_target =
   then (* case a *)
     [get_actual_target implementation_target]
   else
-    let target_callable = Callable.create_method implementation_target in
+    let target_callable = Target.create_method implementation_target in
     match DependencyGraphSharedMemory.get_overriding_types ~member:implementation_target with
     | None ->
         (* case b *)
@@ -304,15 +304,15 @@ let rec resolve_callees_from_type
       | Some receiver_type ->
           let targets =
             match callee_kind with
-            | Method { is_direct_call = true } -> [Callable.create_method name]
+            | Method { is_direct_call = true } -> [Target.create_method name]
             | _ -> compute_indirect_targets ~resolution ~receiver_type name
           in
           Some (RegularTargets { implicit_self = true; targets; collapse_tito })
       | None ->
           let target =
             match callee_kind with
-            | Method _ -> Callable.create_method name
-            | _ -> Callable.create_function name
+            | Method _ -> Target.create_method name
+            | _ -> Target.create_function name
           in
           Some (RegularTargets { implicit_self = false; targets = [target]; collapse_tito }))
   | Type.Callable { kind = Anonymous; _ } -> None
@@ -355,7 +355,7 @@ let rec resolve_callees_from_type
                  targets =
                    [
                      `Method
-                       { Callable.class_name = primitive_callable_name; method_name = "__call__" };
+                       { Target.class_name = primitive_callable_name; method_name = "__call__" };
                    ];
                  collapse_tito;
                })
@@ -585,7 +585,7 @@ let resolve_callees_ignoring_decorators ~resolution ~collapse_tito callee =
                 (RegularTargets
                    {
                      implicit_self = not static;
-                     targets = [`Method { Callable.class_name; method_name = attribute }];
+                     targets = [`Method { Target.class_name; method_name = attribute }];
                      collapse_tito;
                    })
           | _ -> None)
@@ -606,7 +606,7 @@ let resolve_callees_ignoring_decorators ~resolution ~collapse_tito callee =
                 (RegularTargets
                    {
                      implicit_self = true;
-                     targets = [`Method { Callable.class_name; method_name = attribute }];
+                     targets = [`Method { Target.class_name; method_name = attribute }];
                      collapse_tito;
                    })
           | _ -> None)
@@ -669,18 +669,18 @@ let resolve_property_targets ~resolution ~base ~attribute ~setter =
         let targets =
           let receiver_type = resolve_ignoring_optional ~resolution base in
           if Type.is_meta receiver_type then
-            [Callable.create_method (Reference.create ~prefix:parent attribute)]
+            [Target.create_method (Reference.create ~prefix:parent attribute)]
           else
             let callee = Reference.create ~prefix:parent attribute in
             compute_indirect_targets ~resolution ~receiver_type callee
         in
         if setter then
           let to_setter target =
             match target with
-            | `OverrideTarget { Callable.class_name; method_name } ->
-                `OverrideTarget { Callable.class_name; method_name = method_name ^ "$setter" }
-            | `Method { Callable.class_name; method_name } ->
-                `Method { Callable.class_name; method_name = method_name ^ "$setter" }
+            | `OverrideTarget { Target.class_name; method_name } ->
+                `OverrideTarget { Target.class_name; method_name = method_name ^ "$setter" }
+            | `Method { Target.class_name; method_name } ->
+                `Method { Target.class_name; method_name = method_name ^ "$setter" }
             | _ -> target
           in
           List.map targets ~f:to_setter
@@ -864,7 +864,7 @@ let call_graph_of_define
               value))
   in
   let deduplicate callees =
-    let deduplicate_targets targets = List.dedup_and_sort ~compare:Callable.compare targets in
+    let deduplicate_targets targets = List.dedup_and_sort ~compare:Target.compare targets in
     let deduplicate_regular_targets { targets; implicit_self; collapse_tito } =
       { targets = deduplicate_targets targets; implicit_self; collapse_tito }
     in
@@ -896,7 +896,7 @@ let call_graph_of_define
 module SharedMemory = struct
   include
     Memory.WithCache.Make
-      (Callable.RealKey)
+      (Target.RealKey)
       (struct
         type t = callees Location.Map.Tree.t
 
@@ -930,7 +930,7 @@ let create_callgraph ?(use_shared_memory = false) ~environment ~source =
         let call_graph_of_define =
           if use_shared_memory then
             SharedMemory.get_or_compute
-              ~callable:(Callable.create define)
+              ~callable:(Target.create define)
               ~environment
               ~define:(Node.value define)
           else
@@ -955,9 +955,8 @@ let create_callgraph ?(use_shared_memory = false) ~environment ~source =
         in
         Location.Map.data call_graph_of_define
         |> List.concat_map ~f:callees
-        |> List.dedup_and_sort ~compare:Callable.compare
-        |> fun callees ->
-        Callable.RealMap.set dependencies ~key:(Callable.create define) ~data:callees
+        |> List.dedup_and_sort ~compare:Target.compare
+        |> fun callees -> Target.RealMap.set dependencies ~key:(Target.create define) ~data:callees
   in
   Preprocessing.defines ~include_nested:true source
-  |> List.fold ~init:Callable.RealMap.empty ~f:fold_defines
+  |> List.fold ~init:Target.RealMap.empty ~f:fold_defines

source/interprocedural/callGraph.mli

@@ -13,14 +13,14 @@ open Expression
 type regular_targets = {
   implicit_self: bool;
   collapse_tito: bool;
-  targets: Callable.t list;
+  targets: Target.t list;
 }
 [@@deriving eq, show]
 
 type raw_callees =
   | ConstructorTargets of {
-      new_targets: Callable.t list;
-      init_targets: Callable.t list;
+      new_targets: Target.t list;
+      init_targets: Target.t list;
     }
   | RegularTargets of regular_targets
   | HigherOrderTargets of {
@@ -48,17 +48,17 @@ val resolve_ignoring_optional : resolution:Resolution.t -> Ast.Expression.t -> T
 val redirect_special_calls : resolution:Resolution.t -> Call.t -> Call.t
 
 module SharedMemory : sig
-  val add : callable:Callable.real_target -> callees:callees Location.Map.t -> unit
+  val add : callable:Target.real_target -> callees:callees Location.Map.t -> unit
 
   (* Attempts to read the call graph for the given callable from shared memory. If it doesn't exist,
      computes the call graph and writes to shard memory. *)
   val get_or_compute
-    :  callable:Callable.real_target ->
+    :  callable:Target.real_target ->
     environment:Analysis.TypeEnvironment.ReadOnly.t ->
     define:Ast.Statement.Define.t ->
     callees Ast.Location.Map.t
 
-  val remove : Callable.real_target list -> unit
+  val remove : Target.real_target list -> unit
 end
 
 val create_callgraph