Require all functions in src/typechecker.erl to have specs

Makefile

@@ -169,20 +169,22 @@ cli-tests: bin/gradualizer test/arg.beam
  bin/gradualizer --no_prelude --specs_override_dir priv/prelude \
  test/should_pass/cyclic_otp_specs.erl || (echo "CLI 10"; exit 1)
 
+# Cover compile, run eunit, export and generate reports
+define erl_cover_run
+ case cover:compile_beam_directory("ebin") of \
+ {error, _} -> halt(2); \
+ _List -> ok \
+ end, \
+ $(erl_run_eunit), \
+ cover:export("cover/eunit.coverdata"), \
+ cover:analyse_to_file([{outdir, "cover"}]), \
+ cover:analyse_to_file([{outdir, "cover"}, html])
+endef
+
 .PHONY: cover
 cover: compile-tests
  mkdir -p cover
- erl -noinput -pa ebin -pa test -eval \
- '%% Cover compile, run eunit, export and generate reports \
- case cover:compile_beam_directory("ebin") of % \
- {error, _} -> halt(2); % \
- _List -> ok % \
- end, % \
- $(erl_run_eunit), % \
- cover:export("cover/eunit.coverdata"), % \
- cover:analyse_to_file([{outdir, "cover"}]), % plain text \
- cover:analyse_to_file([{outdir, "cover"}, html]), % \
- halt().'
+ erl $(ERL_OPTS) -noinput -pa ebin -pa test -eval '$(erl_cover_run), halt().'
 
 cover/coverage.xml: cover test/covertool.beam
  erl -noinput -pa test -eval \

include/gradualizer.hrl

@@ -29,7 +29,10 @@
 -compile({nowarn_unused_function, ['::'/2, ':::'/2]}).
 -ignore_xref(['::'/2, ':::'/2]).
 
+-spec '::'(any(), any()) -> any().
 '::'(Expr, _Type) -> Expr.
+
+-spec ':::'(any(), any()) -> any().
 ':::'(Expr, _Type) -> Expr.
 
 %% Type annotation

src/constraints.erl

@@ -3,7 +3,7 @@
 
 -export([empty/0, upper/2, lower/2, combine/1, combine/2, add_var/2]).
 
--export_type([constraints/0]).
+-export_type([t/0]).
 
 -type type() :: gradualizer_type:abstract_type().
 
@@ -13,30 +13,30 @@
  exist_vars = #{} :: #{ var() => true }
  }).
 
--type constraints() :: #constraints{}.
+-type t() :: #constraints{}.
 -type var() :: gradualizer_type:gr_type_var().
 
--spec empty() -> constraints().
+-spec empty() -> t().
 empty() ->
  #constraints{}.
 
--spec add_var(var(), constraints()) -> constraints().
+-spec add_var(var(), t()) -> t().
 add_var(Var, Cs) ->
  Cs#constraints{ exist_vars = maps:put(Var, true, Cs#constraints.exist_vars) }.
 
--spec upper(var(), type()) -> constraints().
+-spec upper(var(), type()) -> t().
 upper(Var, Ty) ->
  #constraints{ upper_bounds = #{ Var => [Ty] } }.
 
--spec lower(var(), type()) -> constraints().
+-spec lower(var(), type()) -> t().
 lower(Var, Ty) ->
  #constraints{ lower_bounds = #{ Var => [Ty] } }.
 
--spec combine(constraints(), constraints()) -> constraints().
+-spec combine(t(), t()) -> t().
 combine(C1, C2) ->
  combine([C1, C2]).
 
--spec combine([constraints()]) -> constraints().
+-spec combine([t()]) -> t().
 combine([]) ->
  empty();
 combine([Cs]) ->

src/gradualizer.erl

@@ -397,7 +397,7 @@ env(ErlSource, Opts) ->
 %% @see type_of/2
 -spec type_of(string()) -> typechecker:type().
 type_of(Expr) ->
- type_of(Expr, env([infer])).
+ type_of(Expr, env()).
 
 %% @doc Infer type of an Erlang expression.
 %%
@@ -413,5 +413,6 @@ type_of(Expr) ->
 -spec type_of(string(), typechecker:env()) -> typechecker:type().
 type_of(Expr, Env) ->
  AlwaysInfer = Env#env{infer = true},
- {Ty, _Env, _Cs} = typechecker:type_check_expr(AlwaysInfer, merl:quote(Expr)),
+ [Form] = gradualizer_lib:ensure_form_list(merl:quote(lists:flatten(Expr))),
+ {Ty, _Env, _Cs} = typechecker:type_check_expr(AlwaysInfer, Form),
  Ty.

src/gradualizer_cache.erl

@@ -41,7 +41,7 @@ start_link(Opts) ->
 %% GLB Cache
 %%
 
--spec get_glb(module(), type(), type()) -> false | {type(), constraints:constraints()}.
+-spec get_glb(module(), type(), type()) -> false | {type(), constraints:t()}.
 get_glb(Module, T1, T2) ->
  try ets:lookup(?GLB_CACHE, {Module, T1, T2}) of
  [] ->
@@ -53,7 +53,7 @@ get_glb(Module, T1, T2) ->
  false
  end.
 
--spec store_glb(module(), type(), type(), {type(), constraints:constraints()}) -> ok.
+-spec store_glb(module(), type(), type(), {type(), constraints:t()}) -> ok.
 store_glb(Module, T1, T2, TyCs) ->
  try
  ets:insert(?GLB_CACHE, {{Module, T1, T2}, TyCs}),

src/gradualizer_fmt.erl

@@ -123,10 +123,10 @@ format_type_error({illegal_map_type, Type}, Opts) ->
  [format_location(Type, brief, Opts),
  pp_type(Type, Opts),
  format_location(Type, verbose, Opts)]);
-format_type_error({type_error, list, _Anno, Ty1, Ty}, Opts) ->
+format_type_error({type_error, list, Anno, Ty1, Ty}, Opts) ->
  io_lib:format(
  "~sThe type ~s cannot be an element of a list of type ~s~n",
- [format_location(_Anno, brief, Opts),
+ [format_location(Anno, brief, Opts),
  pp_type(Ty1, Opts),
  pp_type(Ty, Opts)]);
 format_type_error({type_error, list, Anno, Ty}, Opts) ->
@@ -150,8 +150,7 @@ format_type_error({argument_length_mismatch, Anno, LenTy, LenArgs}, Opts) ->
  format_location(Anno, verbose, Opts),
  LenTy,
  LenArgs]);
-format_type_error({type_error, unreachable_clauses, Clauses}, Opts) ->
- Anno = element(2, hd(Clauses)),
+format_type_error({type_error, unreachable_clauses, Anno}, Opts) ->
  io_lib:format(
  "~sThe clause~s cannot be reached~n",
  [format_location(Anno, brief, Opts),

src/gradualizer_type.erl

@@ -23,9 +23,11 @@
 %% Export the additional types that gradualizer uses
 -export_type([abstract_pattern/0,
  af_assoc_type/0,
+ af_atom/0,
  af_binary_op/1,
  af_constrained_function_type/0,
  af_constraint/0,
+ af_field_name/0,
  af_fun_type/0,
  af_function_type_list/0,
  af_record_field/1,