diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-01-29 11:15:46 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-01-29 11:15:46 +0100 |
| commit | cb50354a9d3463cf07b830ecf28260adc5b361c0 (patch) | |
| tree | 4794bac549046c2b1039ec0ac559b955ad3b31fc /bootstrap/lib/stdlib/ebin | |
| parent | d960d54f75c51b81a99a1c5cf40c19f2e9d55068 (diff) | |
| parent | cf5bc2e917dbcb2c2841bf07b995efe105bea4be (diff) | |
| download | otp-cb50354a9d3463cf07b830ecf28260adc5b361c0.tar.gz otp-cb50354a9d3463cf07b830ecf28260adc5b361c0.tar.bz2 otp-cb50354a9d3463cf07b830ecf28260adc5b361c0.zip | |
Merge branch 'egil/maps/OTP-11616'
* egil/maps/OTP-11616: (112 commits)
compiler: Add core compile test for maps
compiler: Fix core parse for Maps
compiler: Fixup #map_pair{} spec
erts: Strengthen map_SUITE tests
erts: Update maps_fold test to respect maps:fold/3
stdlib: Make maps:fold/3 order-independent
erts: Fixup enif_make_map_put on windows
erts: Update preloaded erts_internal.beam
hipe: Fixup update cerl pretty printer
erts: Add map construction to driver API
dialyzer: Add maps tests
dialyzer: Remove dead code
dialyzer: Reflect map_pair core changes in dialyzer
hipe: Update cerl pretty printer
compiler: Update inliner tests
compiler: Squash #c_map_pair_*{} to #c_map_pair{}
compiler: Squash #k_map_pair_*{} to #k_map_pair{}
preloaded: Fixup export cmp_term in erts_internal
erts: Change 'size' argument of enif_get_map_size from int* to size_t*
erts: Fix compile error for halfword emulator
...
Diffstat (limited to 'bootstrap/lib/stdlib/ebin')
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_eval.beam | bin | 29232 -> 30492 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_expand_records.beam | bin | 21872 -> 22428 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_internal.beam | bin | 5200 -> 5236 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_lint.beam | bin | 84628 -> 85972 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_parse.beam | bin | 69620 -> 74708 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_scan.beam | bin | 30064 -> 30124 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/io_lib.beam | bin | 9472 -> 9856 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/maps.beam | bin | 0 -> 1816 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/ms_transform.beam | bin | 20360 -> 20384 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/stdlib.app | 1 | ||||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/stdlib.appup | 6 |
11 files changed, 4 insertions, 3 deletions
diff --git a/bootstrap/lib/stdlib/ebin/erl_eval.beam b/bootstrap/lib/stdlib/ebin/erl_eval.beam Binary files differindex d58dd86070..19fadc9585 100644 --- a/bootstrap/lib/stdlib/ebin/erl_eval.beam +++ b/bootstrap/lib/stdlib/ebin/erl_eval.beam diff --git a/bootstrap/lib/stdlib/ebin/erl_expand_records.beam b/bootstrap/lib/stdlib/ebin/erl_expand_records.beam Binary files differindex 0563699d5e..c8f45fd838 100644 --- a/bootstrap/lib/stdlib/ebin/erl_expand_records.beam +++ b/bootstrap/lib/stdlib/ebin/erl_expand_records.beam diff --git a/bootstrap/lib/stdlib/ebin/erl_internal.beam b/bootstrap/lib/stdlib/ebin/erl_internal.beam Binary files differindex 01c6598cdc..b851ca484e 100644 --- a/bootstrap/lib/stdlib/ebin/erl_internal.beam +++ b/bootstrap/lib/stdlib/ebin/erl_internal.beam diff --git a/bootstrap/lib/stdlib/ebin/erl_lint.beam b/bootstrap/lib/stdlib/ebin/erl_lint.beam Binary files differindex 10d32c9865..c413a7fda1 100644 --- a/bootstrap/lib/stdlib/ebin/erl_lint.beam +++ b/bootstrap/lib/stdlib/ebin/erl_lint.beam diff --git a/bootstrap/lib/stdlib/ebin/erl_parse.beam b/bootstrap/lib/stdlib/ebin/erl_parse.beam Binary files differindex 2815cad4a3..c1c114dd3c 100644 --- a/bootstrap/lib/stdlib/ebin/erl_parse.beam +++ b/bootstrap/lib/stdlib/ebin/erl_parse.beam diff --git a/bootstrap/lib/stdlib/ebin/erl_scan.beam b/bootstrap/lib/stdlib/ebin/erl_scan.beam Binary files differindex 851270bd37..fe45755343 100644 --- a/bootstrap/lib/stdlib/ebin/erl_scan.beam +++ b/bootstrap/lib/stdlib/ebin/erl_scan.beam diff --git a/bootstrap/lib/stdlib/ebin/io_lib.beam b/bootstrap/lib/stdlib/ebin/io_lib.beam Binary files differindex d34f69097a..ad77021190 100644 --- a/bootstrap/lib/stdlib/ebin/io_lib.beam +++ b/bootstrap/lib/stdlib/ebin/io_lib.beam diff --git a/bootstrap/lib/stdlib/ebin/maps.beam b/bootstrap/lib/stdlib/ebin/maps.beam Binary files differnew file mode 100644 index 0000000000..9a902a1ae4 --- /dev/null +++ b/bootstrap/lib/stdlib/ebin/maps.beam diff --git a/bootstrap/lib/stdlib/ebin/ms_transform.beam b/bootstrap/lib/stdlib/ebin/ms_transform.beam Binary files differindex 6e7a19c78a..9a55c521f8 100644 --- a/bootstrap/lib/stdlib/ebin/ms_transform.beam +++ b/bootstrap/lib/stdlib/ebin/ms_transform.beam diff --git a/bootstrap/lib/stdlib/ebin/stdlib.app b/bootstrap/lib/stdlib/ebin/stdlib.app index d1da05048b..31c7222100 100644 --- a/bootstrap/lib/stdlib/ebin/stdlib.app +++ b/bootstrap/lib/stdlib/ebin/stdlib.app @@ -71,6 +71,7 @@ lib, lists, log_mf_h, + maps, math, ms_transform, orddict, diff --git a/bootstrap/lib/stdlib/ebin/stdlib.appup b/bootstrap/lib/stdlib/ebin/stdlib.appup index b8460d543c..0871dc5a98 100644 --- a/bootstrap/lib/stdlib/ebin/stdlib.appup +++ b/bootstrap/lib/stdlib/ebin/stdlib.appup @@ -15,13 +15,13 @@ %% under the License. %% %% %CopyrightEnd% -{"1.20", +{"2.0", %% Up from - max two major revisions back - [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15 %% Down to - max two major revisions back - [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15 }. |