From 58611b15d06a3129087f7361ab39c557f8d213a9 Mon Sep 17 00:00:00 2001
From: Cristiano Calcagno <cristianoc@fb.com>
Date: Wed, 3 Feb 2016 07:59:56 -0800
Subject: [PATCH] Cleanup of CMethod_signature.

Reviewed By: akotulski

Differential Revision: D2895639

fb-gh-sync-id: 181adf2
---
 infer/src/clang/cMethod_signature.ml | 111 +++++++++++++--------------
 1 file changed, 55 insertions(+), 56 deletions(-)

diff --git a/infer/src/clang/cMethod_signature.ml b/infer/src/clang/cMethod_signature.ml
index 624a449af..cf2ad35a5 100644
--- a/infer/src/clang/cMethod_signature.ml
+++ b/infer/src/clang/cMethod_signature.ml
@@ -11,86 +11,85 @@
 (** return type, location and whether its an instance method.  *)
 
 type method_signature = {
-  mutable _name : Procname.t;
-  _args : (string * Clang_ast_t.type_ptr) list;
-  _ret_type : Clang_ast_t.type_ptr;
-  _attributes : Clang_ast_t.attribute list;
-  _loc : Clang_ast_t.source_range;
-  _is_instance : bool;
-  _language : CFrontend_config.lang;
-  _pointer_to_parent : Clang_ast_t.pointer option;
-  _pointer_to_property_opt : Clang_ast_t.pointer option; (* If set then method is a getter/setter *)
-  _has_return_param : bool;
+  mutable name : Procname.t;
+  args : (string * Clang_ast_t.type_ptr) list;
+  ret_type : Clang_ast_t.type_ptr;
+  attributes : Clang_ast_t.attribute list;
+  loc : Clang_ast_t.source_range;
+  is_instance : bool;
+  language : CFrontend_config.lang;
+  pointer_to_parent : Clang_ast_t.pointer option;
+  pointer_to_property_opt : Clang_ast_t.pointer option; (* If set then method is a getter/setter *)
+  has_return_param : bool;
 }
 
-let ms_get_name ms =
-  ms._name
+let ms_get_name { name } =
+  name
 
 let ms_set_name ms name =
-  ms._name <- name
+  ms.name <- name
 
-let ms_get_args ms =
-  ms._args
+let ms_get_args { args } =
+  args
 
-let ms_get_ret_type ms =
-  ms._ret_type
+let ms_get_ret_type { ret_type } =
+  ret_type
 
-let ms_get_attributes ms =
-  ms._attributes
+let ms_get_attributes { attributes } =
+  attributes
 
-let ms_get_loc ms =
-  ms._loc
+let ms_get_loc { loc } =
+  loc
 
-let ms_is_instance ms =
-  ms._is_instance
+let ms_is_instance { is_instance } =
+  is_instance
 
-let ms_get_lang ms =
-  ms._language
+let ms_get_lang { language } =
+  language
 
-let ms_get_pointer_to_parent ms =
-  ms._pointer_to_parent
+let ms_get_pointer_to_parent { pointer_to_parent } =
+  pointer_to_parent
 
-let ms_get_pointer_to_property_opt ms =
-  ms._pointer_to_property_opt
+let ms_get_pointer_to_property_opt { pointer_to_property_opt } =
+  pointer_to_property_opt
 
-let ms_has_return_param ms =
-  ms._has_return_param
+let ms_has_return_param { has_return_param } =
+  has_return_param
 
 (* A method is a getter if it has a link to a property and *)
 (* it has 1 argument (this includes self) *)
-let ms_is_getter ms =
-  Option.is_some ms._pointer_to_property_opt &&
-  IList.length ms._args == 1
+let ms_is_getter { pointer_to_property_opt; args }  =
+  Option.is_some pointer_to_property_opt &&
+  IList.length args == 1
 
 (* A method is a setter if it has a link to a property and *)
 (* it has 2 argument (this includes self) *)
-let ms_is_setter ms =
-  Option.is_some ms._pointer_to_property_opt &&
-  IList.length ms._args == 2
+let ms_is_setter { pointer_to_property_opt; args } =
+  Option.is_some pointer_to_property_opt &&
+  IList.length args == 2
 
-let make_ms procname args ret_type attributes loc is_instance lang pointer_to_parent
+let make_ms name args ret_type attributes loc is_instance language pointer_to_parent
     pointer_to_property_opt ~has_return_param =
-  let meth_signature = {
-    _name = procname;
-    _args = args;
-    _ret_type = ret_type;
-    _attributes = attributes;
-    _loc = loc;
-    _is_instance = is_instance;
-    _language = lang;
-    _pointer_to_parent = pointer_to_parent;
-    _pointer_to_property_opt = pointer_to_property_opt;
-    _has_return_param = has_return_param;
-  } in
-  meth_signature
+  {
+    name;
+    args;
+    ret_type;
+    attributes;
+    loc;
+    is_instance;
+    language;
+    pointer_to_parent;
+    pointer_to_property_opt;
+    has_return_param;
+  }
 
 let replace_name_ms ms name =
-  { ms with _name = name }
+  { ms with name }
 
 let ms_to_string ms =
-  "Method " ^ (Procname.to_string ms._name) ^ " " ^
+  "Method " ^ (Procname.to_string ms.name) ^ " " ^
   IList.to_string
     (fun (s1, s2) -> s1 ^ ", " ^ (Clang_ast_j.string_of_type_ptr s2))
-    ms._args
-  ^ "->" ^ (Clang_ast_j.string_of_type_ptr ms._ret_type) ^ " " ^
-  Clang_ast_j.string_of_source_range ms._loc
+    ms.args
+  ^ "->" ^ (Clang_ast_j.string_of_type_ptr ms.ret_type) ^ " " ^
+  Clang_ast_j.string_of_source_range ms.loc