Merge pull request #277 from yuezato/branch_for_issue126

Support the binary and bitstring types

lib/bif.ml

@@ -5,6 +5,9 @@ let string = Type.(of_elem (TyList (of_elem TyNumber)))
 let pid = Type.(of_elem TyPid)
 let port = Type.(of_elem TyPort)
 let reference = Type.(of_elem TyReference)
+let binary = Type.(of_elem (TyBitstring (0, 8)))
+let bitstring = Type.(of_elem (TyBitstring (0, 1)))
+let integer = Type.(of_elem TyNumber) (*TODO*)
 let pos_integer = Type.(of_elem TyNumber) (*TODO*)
 let non_neg_integer = Type.(of_elem TyNumber) (*TODO*)
 let atom s = Type.(of_elem (TySingleton (Atom s)))
@@ -184,4 +187,12 @@ let type_sigs = [
      Type.(of_elem (TyFun ([], reference))));
     ({module_name="erlang"; function_name="ref_to_list"; arity=1},
      Type.(of_elem (TyFun ([reference], string))));
+
+    (* binary *)
+    ({module_name="erlang"; function_name="binary_to_integer"; arity=1},
+     Type.(of_elem (TyFun ([binary], integer))));
+
+    (* bitstring *)
+    ({module_name="erlang"; function_name="bit_size"; arity=1},
+     Type.(of_elem (TyFun ([bitstring], pos_integer))));
   ]

lib/type.ml

@@ -17,6 +17,7 @@ type t =
     | TyFun of t list * t
     | TyAnyMap
     | TyPid | TyPort | TyReference
+    | TyBitstring of int * int (* TODO: change to non_neg_int * non_neg_int *)
 [@@deriving sexp_of]
 
 (* ref: http://erlang.org/doc/reference_manual/typespec.html *)
@@ -40,6 +41,7 @@ and pp_t_union_elem = function
   | TyPid -> "pid()"
   | TyPort -> "port()"
   | TyReference -> "reference()"
+  | TyBitstring (m, n) -> Printf.sprintf "<<_:%d, _:_*%d>>" m n
 
 let bool = TyUnion [TySingleton (Atom "true"); TySingleton (Atom "false")]
 let of_elem e = TyUnion [e]
@@ -54,7 +56,8 @@ and variables_elem = function
   | TyAtom
   | TySingleton _
   | TyAnyMap
-  | TyPid | TyPort | TyReference -> []
+  | TyPid | TyPort | TyReference
+  | TyBitstring _ -> []
   | TyList t ->
     variables t
   | TyTuple ts ->
@@ -95,6 +98,9 @@ and sup_elems_to_list store = function
   | TyReference :: ty1s ->
      let store' = List.filter ~f:(function TyReference -> false | _ -> true) store in
      sup_elems_to_list (TyReference :: store') ty1s
+  | TyBitstring (m, n) :: ty1s ->
+     let store' = List.filter ~f:(function TyBitstring (m', n') -> m = m' && n = n' | _ -> true) store in
+     sup_elems_to_list (TyBitstring (m, n) :: store') ty1s
   | TySingleton (Number n) :: ty1s when List.exists ~f:((=) TyNumber) store ->
      sup_elems_to_list store ty1s
   | TySingleton (Number n) :: ty1s ->
@@ -220,6 +226,7 @@ and subst_elem (v, ty0) = function
   | TyPid -> TyUnion [TyPid]
   | TyPort -> TyUnion [TyPort]
   | TyReference -> TyUnion [TyReference]
+  | TyBitstring (m, n) -> TyUnion [TyBitstring (m, n)]
 
 let solve_constraints_map map =
   let subst_all (v, expr) l =
@@ -303,8 +310,10 @@ let rec of_absform = function
      of_elem TyPort
   | F.TyPredef {name="reference"; args=[]; _} ->
      of_elem TyReference
-  | F.TyPredef {name="binary"; args=[]; _}
-  | F.TyPredef {name="bitstring"; args=[]; _}
+  | F.TyPredef {name="binary"; args=[]; _} ->
+     of_elem (TyBitstring (0, 8))
+  | F.TyPredef {name="bitstring"; args=[]; _} ->
+     of_elem (TyBitstring (0, 1))
   | F.TyPredef {name="byte"; args=[]; _}
   | F.TyPredef {name="char"; args=[]; _}
   | F.TyPredef {name="iodata"; args=[]; _}

test/blackbox-test/test-cases/binary_bitstring_error.erl

@@ -0,0 +1,6 @@
+-module(binary_bitstring_error).
+-export([main/1]).
+
+main(X) ->
+    _ = binary_to_integer(X), %% binary -> integer.
+    _ = bit_size(X). %% bitstring -> integer >= 0.

test/blackbox-test/test-cases/binary_bitstring_error.expected

@@ -0,0 +1,4 @@
+TODO:filename:5: Type error: type mismatch;
+  found   : <<_:0, _:_*1>>
+  required: <<_:0, _:_*8>>
+there is no solution that satisfies subtype constraints