diff --git a/infer/src/Makefile.in b/infer/src/Makefile.in index 80ab775a5..4e41b9b5c 100644 --- a/infer/src/Makefile.in +++ b/infer/src/Makefile.in @@ -92,6 +92,7 @@ OCAMLBUILD_OPTIONS = \ -cflags -w,@20 \ -cflags -w,@26 \ -cflags -w,@35 \ + -cflags -w,@37 \ -cflags -w,@38 \ -cflags -w,@39 \ -tag-line "<*clang/clang_ast_*>: warn(-35-39)" \ diff --git a/infer/src/backend/DB.ml b/infer/src/backend/DB.ml index 3185dadae..033372883 100644 --- a/infer/src/backend/DB.ml +++ b/infer/src/backend/DB.ml @@ -60,9 +60,9 @@ let rel_source_file_from_abs_path root fname = abs_source_file_from_path fname type encoding_type = - Enc_base | Enc_path_with_underscores | Enc_crc + [ `Enc_base | `Enc_path_with_underscores | `Enc_crc ] -let curr_encoding = Enc_crc +let curr_encoding = `Enc_crc let source_file_to_string fname = match fname with @@ -91,11 +91,11 @@ let source_file_to_rel_path fname = let source_file_encoding source_file = let source_file_s = source_file_to_string source_file in match curr_encoding with - | Enc_base -> + | `Enc_base -> Filename.basename source_file_s - | Enc_path_with_underscores -> + | `Enc_path_with_underscores -> Escape.escape_path source_file_s - | Enc_crc -> + | `Enc_crc -> let base = Filename.basename source_file_s in let dir = Filename.dirname source_file_s in string_append_crc_cutoff ~key:dir base diff --git a/infer/src/backend/dotty.ml b/infer/src/backend/dotty.ml index b10af1578..4745a54f3 100644 --- a/infer/src/backend/dotty.ml +++ b/infer/src/backend/dotty.ml @@ -1127,15 +1127,6 @@ type visual_heap_edge = { let mk_visual_heap_edge s t l = { src = s; trg = t; lab = l } -(* a visual heap has an integer identifier, a set of nodes and a set of edges*) -type visual_heap = - | VH of int * visual_heap_node list * visual_heap_edge list - -(* set of visual heaps used to represent a proposition. In general, since we have high-order *) -(* lists a proposition is not a single visual heap but a set of it. The parameter of a high-order*) -(* list is visualized with a distinct visual heap. Similarly for the parameter in new arrays*) -type visual_proposition = visual_heap list - (* used to generate unique identifier for all the nodes in the set of visual graphs used to *) (* represent a proposition*) let global_node_counter = ref 0 diff --git a/infer/src/backend/prop.ml b/infer/src/backend/prop.ml index 8f22406f0..b9b682b26 100644 --- a/infer/src/backend/prop.ml +++ b/infer/src/backend/prop.ml @@ -27,8 +27,8 @@ let unSome = function | Some x -> x | _ -> assert false -type normal = Normal (** kind for normal props, i.e. normalized *) -type exposed = Exposed (** kind for exposed props *) +type normal (** kind for normal props, i.e. normalized *) +type exposed (** kind for exposed props *) (** A proposition. The following invariants are mantained. [sub] is of the form id1 = e1 ... idn = en where: the id's are distinct and do not diff --git a/infer/src/backend/specs.ml b/infer/src/backend/specs.ml index b740286ff..876c9c413 100644 --- a/infer/src/backend/specs.ml +++ b/infer/src/backend/specs.ml @@ -302,8 +302,6 @@ type phase = FOOTPRINT | RE_EXECUTION type dependency_map_t = int Procname.Map.t -type is_library = Source | Library - (** Payload: results of some analysis *) type payload = { diff --git a/infer/src/eradicate/typeCheck.ml b/infer/src/eradicate/typeCheck.ml index cde066772..9463966e4 100644 --- a/infer/src/eradicate/typeCheck.ml +++ b/infer/src/eradicate/typeCheck.ml @@ -25,7 +25,6 @@ module ComplexExpressions = struct Boolean checks (e.g. null check) and assignments on expressions considered constant are retained across the control flow assuming there are no modifications in between. *) type expressions_constant = - | FL_NO (* none *) | FL_PARAMETER_STATIC (* parameter.field and static fields *) | FL_ALL_NESTED_FIELDS (* all forms of var.field1. ... .fieldn *) | FUNCTIONS_IDEMPOTENT (* the above plus function calls are considered idempotent *) diff --git a/infer/src/java/jFrontend.ml b/infer/src/java/jFrontend.ml index 2f8a90caa..a94037d5b 100644 --- a/infer/src/java/jFrontend.ml +++ b/infer/src/java/jFrontend.ml @@ -174,11 +174,11 @@ let create_icfg never_null_matcher linereader program icfg cn node = (* This type definition is for a future improvement of the capture where in one pass, the frontend will translate things differently whether a source file is found for a given class -*) type capture_status = | With_source of string | Library of string | Unknown +*) (* returns true for the set of classes that are selected to be translated *) let should_capture classes package_opt source_basename node =