syntax_tools: Add tests for types and specs

4 files changed, 181 insertions, 6 deletions

diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl
index eb52cce6af..b935d42bb7 100644
--- a/lib/syntax_tools/test/syntax_tools_SUITE.erl
+++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl
@@ -61,7 +61,7 @@ appup_test(Config) when is_list(Config) ->
 smoke_test(Config) when is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(12)),
     Wc = filename:join([code:lib_dir(),"*","src","*.erl"]),
-    Fs = filelib:wildcard(Wc),
+    Fs = filelib:wildcard(Wc) ++ test_files(Config),
     io:format("~p files\n", [length(Fs)]),
     case p_run(fun smoke_test_file/1, Fs) of
         0 -> ok;
@@ -93,7 +93,7 @@ print_error_markers(F, File) ->
 revert(Config) when is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(12)),
     Wc = filename:join([code:lib_dir("stdlib"),"src","*.erl"]),
-    Fs = filelib:wildcard(Wc),
+    Fs = filelib:wildcard(Wc) ++ test_files(Config),
     Path = [filename:join(code:lib_dir(stdlib), "include"),
             filename:join(code:lib_dir(kernel), "include")],
     io:format("~p files\n", [length(Fs)]),
@@ -203,18 +203,25 @@ t_erl_parse_type(Config) when is_list(Config) ->
 t_epp_dodger(Config) when is_list(Config) ->
     DataDir   = ?config(data_dir, Config),
     PrivDir   = ?config(priv_dir, Config),
-    Filenames = ["syntax_tools_SUITE_test_module.erl",
-		 "syntax_tools_test.erl"],
+    Filenames = test_files(),
     ok = test_epp_dodger(Filenames,DataDir,PrivDir),
     ok.
 
 t_comment_scan(Config) when is_list(Config) ->
     DataDir   = ?config(data_dir, Config),
-    Filenames = ["syntax_tools_SUITE_test_module.erl",
-		 "syntax_tools_test.erl"],
+    Filenames = test_files(),
     ok = test_comment_scan(Filenames,DataDir),
     ok.
 
+test_files(Config) ->
+    DataDir = ?config(data_dir, Config),
+    [ filename:join(DataDir,Filename) || Filename <- test_files() ].
+
+test_files() ->
+    ["syntax_tools_SUITE_test_module.erl",
+     "syntax_tools_test.erl",
+     "type_specs.erl"].
+
 t_igor(Config) when is_list(Config) ->
     DataDir   = ?config(data_dir, Config),
     PrivDir   = ?config(priv_dir, Config),
@@ -222,6 +229,12 @@ t_igor(Config) when is_list(Config) ->
     FileM2  = filename:join(DataDir,"m2.erl"),
     ["m.erl",_]=R = igor:merge(m,[FileM1,FileM2],[{outdir,PrivDir}]),
     io:format("igor:merge/3 = ~p~n", [R]),
+
+    FileTypeSpecs = filename:join(DataDir,"igor_type_specs.erl"),
+    Empty = filename:join(DataDir,"empty.erl"),
+    ["n.erl",_]=R2 = igor:merge(n,[FileTypeSpecs,Empty],[{outdir,PrivDir}]),
+    io:format("igor:merge/3 = ~p~n", [R2]),
+
     ok.
 
 test_comment_scan([],_) -> ok;
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE_data/empty.erl b/lib/syntax_tools/test/syntax_tools_SUITE_data/empty.erl
new file mode 100644
index 0000000000..877ff66013
--- /dev/null
+++ b/lib/syntax_tools/test/syntax_tools_SUITE_data/empty.erl
@@ -0,0 +1 @@
+-module(empty).
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE_data/igor_type_specs.erl b/lib/syntax_tools/test/syntax_tools_SUITE_data/igor_type_specs.erl
new file mode 100644
index 0000000000..5a156c7fa3
--- /dev/null
+++ b/lib/syntax_tools/test/syntax_tools_SUITE_data/igor_type_specs.erl
@@ -0,0 +1,80 @@
+%% Same as ./type_specs.erl, but without macros.
+-module(igor_type_specs).
+
+-include_lib("syntax_tools/include/merl.hrl").
+
+-export([f/1, b/0, c/2]).
+
+-export_type([t/0, ot/2, ff2/0]).
+
+-type aa() :: _.
+
+-type t() :: integer().
+
+-type ff(A) :: ot(A, A) | tuple() | 1..3 | map() | {}.
+-type ff1() :: ff(bin()) | foo:bar().
+-type ff2() :: {list(), [_], list(integer()),
+                nonempty_list(), nonempty_list(atom()), [ff1(), ...],
+                nil(), []}.
+-type bin() :: <<>>
+             | <<_:(+4)>>
+             | <<_:_*8>>
+             | <<_:12, _:_*16>>
+             | <<_:16, _:_*(0)>> % same as "<<_:16>>"
+             | <<_:16, _:_*(+0)>>.
+
+-callback cb() -> t().
+
+-optional_callbacks([cb/0]).
+
+-opaque ot(A, B) :: {A, B}.
+
+-type f1() :: fun().
+-type f2() :: fun((...) -> t()).
+-type f3() :: fun(() -> t()).
+-type f4() :: fun((t(), t()) -> t()).
+
+-wild(attribute).
+
+-record(par, {a :: undefined | igor_type_specs}).
+
+-record(r0, {}).
+
+-record(r,
+        {f1 :: integer(),
+         f2 = a :: atom(),
+         f3 :: fun(),
+         f4 = 7}).
+
+-type r0() :: #r0{} | #r{f1 :: 3} | #r{f1 :: 3, f2 :: 'sju'}.
+
+-type m1() :: #{}.
+-type m2() :: #{a => m1(), b => #{} | fy:m2()}.
+-type b1() :: B1 :: binary() | (BitString :: bitstring()).
+
+-define(PAIR(A, B), {(A), (B)}).
+
+-spec igor_type_specs:f({r0(), r0()}) -> {t(), t()}.
+
+f({R, R}) ->
+    _ = "igor_type_specs" ++ "hej",
+    _ = <<"foo">>,
+    _ = R#r.f1,
+    _ = R#r{f1 = 17, f2 = b},
+    {1, 1}.
+
+-spec igor_type_specs:b() -> integer() | fun().
+
+b() ->
+    case foo:bar() of
+        #{a := 2} -> 19
+    end.
+
+-spec c(Atom :: atom(), Integer :: integer()) -> {atom(), integer()};
+       (X, Y) -> {atom(), float()} when X :: atom(),
+                                        is_subtype(Y, float());
+       (integer(), atom()) -> {integer(), atom()}.
+
+c(A, B) ->
+    _ = integer,
+    {A, B}.
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl b/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl
new file mode 100644
index 0000000000..d5a9554f18
--- /dev/null
+++ b/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl
@@ -0,0 +1,81 @@
+-module(type_specs).
+
+-include_lib("syntax_tools/include/merl.hrl").
+
+-export([f/1, b/0, c/2]).
+
+-export_type([t/0, ot/2, ff2/0]).
+
+-type aa() :: _.
+
+-type t() :: integer().
+
+-type ff(A) :: ot(A, A) | tuple() | 1..3 | map() | {}.
+-type ff1() :: ff(bin()) | foo:bar().
+-type ff2() :: {list(), [_], list(integer()),
+                nonempty_list(), nonempty_list(atom()), [ff1(), ...],
+                nil(), []}.
+-type bin() :: <<>>
+             | <<_:(+4)>>
+             | <<_:_*8>>
+             | <<_:12, _:_*16>>
+             | <<_:16, _:_*(0)>> % same as "<<_:16>>"
+             | <<_:16, _:_*(+0)>>.
+
+-callback cb() -> t().
+
+-optional_callbacks([cb/0]).
+
+-opaque ot(A, B) :: {A, B}.
+
+-type f1() :: fun().
+-type f2() :: fun((...) -> t()).
+-type f3() :: fun(() -> t()).
+-type f4() :: fun((t(), t()) -> t()).
+
+-wild(attribute).
+
+-record(par, {a :: undefined | ?MODULE}).
+
+-record(r0, {}).
+
+-record(r,
+        {f1 :: integer(),
+         f2 = a :: atom(),
+         f3 :: fun(),
+         f4 = 7}).
+
+-type r0() :: #r0{} | #r{f1 :: 3} | #r{f1 :: 3, f2 :: 'sju'}.
+
+-type m1() :: #{}.
+-type m2() :: #{a => m1(), b => #{} | fy:m2()}.
+-type b1() :: B1 :: binary() | (BitString :: bitstring()).
+
+-define(PAIR(A, B), {(A), (B)}).
+
+-spec ?MODULE:f(?PAIR(r0(), r0())) -> ?PAIR(t(), t()).
+
+f({R, R}) ->
+    _ = ?MODULE_STRING ++ "hej",
+    _ = <<"foo">>,
+    _ = R#r.f1,
+    _ = R#r{f1 = 17, f2 = b},
+    {1, 1}.
+
+-spec ?MODULE:b() -> integer() | fun().
+
+b() ->
+    case foo:bar() of
+        #{a := 2} -> 19
+    end.
+
+-define(I, integer).
+
+-spec c(Atom :: atom(), Integer :: ?I()) -> {atom(), integer()};
+       (X, Y) -> {atom(), float()} when X :: atom(),
+                                        is_subtype(Y, float());
+       (integer(), atom()) -> {integer(), atom()}.
+
+c(A, B) ->
+    _ = ?I,
+    {A, B}.