diff options
| author | Hans Bolinder <hasse@erlang.org> | 2019-08-20 08:41:00 +0200 |
|---|---|---|
| committer | Hans Bolinder <hasse@erlang.org> | 2019-08-20 08:41:00 +0200 |
| commit | ae97c3416bbbc7a5aa181814bb82b573cbc9da7f (patch) | |
| tree | d6405d72ad9ca238dc56119fa19a60ad5a102d60 | |
| parent | 44c7f022e3a0e9c1fc2f906790413946cb48e58b (diff) | |
| parent | e2c6e9446cb3ce48f87909dd77ae68892e9126d5 (diff) | |
| download | otp-ae97c3416bbbc7a5aa181814bb82b573cbc9da7f.tar.gz otp-ae97c3416bbbc7a5aa181814bb82b573cbc9da7f.tar.bz2 otp-ae97c3416bbbc7a5aa181814bb82b573cbc9da7f.zip | |
Merge branch 'maint'
* maint:
fun2ms: accept ++ in function head when called from shell
| -rw-r--r-- | lib/stdlib/src/ms_transform.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/ms_transform_SUITE.erl | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl index 97ec785c62..74efe5c513 100644 --- a/lib/stdlib/src/ms_transform.erl +++ b/lib/stdlib/src/ms_transform.erl @@ -1100,6 +1100,8 @@ normalise({bin,_,Fs}) -> B; normalise({cons,_,Head,Tail}) -> [normalise(Head)|normalise(Tail)]; +normalise({op,_,'++',A,B}) -> + normalise(A) ++ normalise(B); normalise({tuple,_,Args}) -> list_to_tuple(normalise_list(Args)); normalise({map,_,Pairs0}) -> diff --git a/lib/stdlib/test/ms_transform_SUITE.erl b/lib/stdlib/test/ms_transform_SUITE.erl index d1e6faf863..29423ed032 100644 --- a/lib/stdlib/test/ms_transform_SUITE.erl +++ b/lib/stdlib/test/ms_transform_SUITE.erl @@ -281,6 +281,8 @@ basic_ets(Config) when is_list(Config) -> compile_and_run(<<"ets:fun2ms(fun({A,B}) -> {B,A} end)">>), [{{'$1','$2'},[],[['$2','$1']]}] = compile_and_run(<<"ets:fun2ms(fun({A,B}) -> [B,A] end)">>), + [{{"foo" ++ '_','$1'},[],['$1']}] = + compile_and_run(<<"ets:fun2ms(fun({\"foo\" ++ _, X}) -> X end)">>), ok. %% Tests basic ets:fun2ms. @@ -313,6 +315,8 @@ from_shell(Config) when is_list(Config) -> [{[a,b],[],[{message,banan},{return_trace}]}] = do_eval( "dbg:fun2ms(fun([a,b]) -> message(banan), return_trace() end)"), + [{{"foo" ++ '_','$1'},[],['$1']}] = + do_eval("ets:fun2ms(fun({\"foo\" ++ _, X}) -> X end)"), ok. %% Tests expansion of records in fun2ms. |