diff options
| author | Hans Bolinder <[email protected]> | 2016-10-19 10:37:15 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-10-19 10:37:15 +0200 |
| commit | 76d5dda52726197f0e207e44e76b1acc6343474b (patch) | |
| tree | 870848414f185628e1e920c64c4edb288206c533 | |
| parent | 613f7c3a7b9e1764e045c1253d1cef4958a234c5 (diff) | |
| parent | 9a7f521f9d6eba398af2e703863f9975911085a4 (diff) | |
| download | otp-76d5dda52726197f0e207e44e76b1acc6343474b.tar.gz otp-76d5dda52726197f0e207e44e76b1acc6343474b.tar.bz2 otp-76d5dda52726197f0e207e44e76b1acc6343474b.zip | |
Merge branch 'maint'
* maint:
dbg:fun2ms: allow empty list as head
| -rw-r--r-- | lib/stdlib/src/ms_transform.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/ms_transform_SUITE.erl | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl index c0eea652e7..98745b13f3 100644 --- a/lib/stdlib/src/ms_transform.erl +++ b/lib/stdlib/src/ms_transform.erl @@ -451,6 +451,8 @@ check_type(_,[{record,_,_,_}],ets) -> ok; check_type(_,[{cons,_,_,_}],dbg) -> ok; +check_type(_,[{nil,_}],dbg) -> + ok; check_type(Line0,[{match,_,{var,_,_},X}],Any) -> check_type(Line0,[X],Any); check_type(Line0,[{match,_,X,{var,_,_}}],Any) -> diff --git a/lib/stdlib/test/ms_transform_SUITE.erl b/lib/stdlib/test/ms_transform_SUITE.erl index 1c5faa960b..f35013b1b2 100644 --- a/lib/stdlib/test/ms_transform_SUITE.erl +++ b/lib/stdlib/test/ms_transform_SUITE.erl @@ -296,6 +296,8 @@ basic_dbg(Config) when is_list(Config) -> compile_and_run(<<"dbg:fun2ms(fun([A,B]) -> bindings() end)">>), [{['$1','$2'],[],['$_']}] = compile_and_run(<<"dbg:fun2ms(fun([A,B]) -> object() end)">>), + [{[],[],[{return_trace}]}] = + compile_and_run(<<"dbg:fun2ms(fun([]) -> return_trace() end)">>), ok. %% Test calling of ets/dbg:fun2ms from the shell. |