diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-05-14 17:18:21 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-05-14 17:18:21 +0200 |
| commit | a0cea0422fbaf6c9eb896fbb6e4f032f2546e903 (patch) | |
| tree | c77bc6051fcb4d5595cb28455c700dd5b0a0b065 | |
| parent | 5ade234d37600ea80dbb309f431c615937ea253d (diff) | |
| parent | c8695cd2b0fcd95f0af5c67bf049d19dbba5ec82 (diff) | |
| download | otp-a0cea0422fbaf6c9eb896fbb6e4f032f2546e903.tar.gz otp-a0cea0422fbaf6c9eb896fbb6e4f032f2546e903.tar.bz2 otp-a0cea0422fbaf6c9eb896fbb6e4f032f2546e903.zip | |
Merge branch 'rolkar/fix-syntax_tools-revert-bug/OTP-11930' into maint
* rolkar/fix-syntax_tools-revert-bug/OTP-11930:
Fix reverting map in syntax_tools
Add test case to syntax_tools
| -rw-r--r-- | lib/syntax_tools/src/erl_syntax.erl | 4 | ||||
| -rw-r--r-- | lib/syntax_tools/test/syntax_tools_SUITE.erl | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl index c9996c954e..46a5ca48df 100644 --- a/lib/syntax_tools/src/erl_syntax.erl +++ b/lib/syntax_tools/src/erl_syntax.erl @@ -2071,7 +2071,7 @@ map_field_assoc_value(Node) -> {map_field_assoc, _, _, Value} -> Value; _ -> - (data(Node))#map_field_assoc.name + (data(Node))#map_field_assoc.value end. @@ -2129,7 +2129,7 @@ map_field_exact_value(Node) -> {map_field_exact, _, _, Value} -> Value; _ -> - (data(Node))#map_field_exact.name + (data(Node))#map_field_exact.value end. diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl index d4c54a72aa..6fb3e5ccfb 100644 --- a/lib/syntax_tools/test/syntax_tools_SUITE.erl +++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl @@ -24,12 +24,12 @@ init_per_group/2,end_per_group/2]). %% Test cases --export([app_test/1,appup_test/1,smoke_test/1,revert/1]). +-export([app_test/1,appup_test/1,smoke_test/1,revert/1,revert_map/1]). suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> - [app_test,appup_test,smoke_test,revert]. + [app_test,appup_test,smoke_test,revert,revert_map]. groups() -> []. @@ -109,6 +109,16 @@ revert_file(File, Path) -> ok end. +%% Testing bug fix for reverting map_field_assoc +revert_map(Config) -> + Dog = ?t:timetrap(?t:minutes(1)), + ?line [{map_field_assoc,16,{atom,17,name},{var,18,'Value'}}] = + erl_syntax:revert_forms([{tree,map_field_assoc, + {attr,16,[],none}, + {map_field_assoc, + {atom,17,name},{var,18,'Value'}}}]), + ?line ?t:timetrap_cancel(Dog). + p_run(Test, List) -> N = erlang:system_info(schedulers), p_run_loop(Test, List, N, [], 0). |