diff options
| author | Björn Gustavsson <[email protected]> | 2016-11-28 12:52:27 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-11-28 12:52:27 +0100 |
| commit | 25a135e9187c8d000ef7a9ec343184ccce1bc9bb (patch) | |
| tree | 6b489f51378714febadf44ee62f44ec0366e4b34 /erts | |
| parent | 4c60be1b45e3e18606f552d4cc6afc2eaad18576 (diff) | |
| parent | e7602e9e90863e6d5c409d61b755008cfab13b8c (diff) | |
| download | otp-25a135e9187c8d000ef7a9ec343184ccce1bc9bb.tar.gz otp-25a135e9187c8d000ef7a9ec343184ccce1bc9bb.tar.bz2 otp-25a135e9187c8d000ef7a9ec343184ccce1bc9bb.zip | |
Merge branch 'richcarl/code-change-utils/PR-1257/OTP-14059'
* richcarl/code-change-utils/PR-1257/OTP-14059:
Update preloaded modules
Add shell mm() and lm() functions
Add code:module_status/1 and modified_modules/0
Fix spec for erlang:get_module_info()
Handle prefetched paths
Restructure code:which() and where_is_file()
Remove remnants of module package support
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 105940 -> 105984 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 13 |
2 files changed, 8 insertions, 5 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 6159228bff..8247c399a4 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index f502a7cd36..15c3e01653 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -983,9 +983,10 @@ get_keys(_Val) -> erlang:nif_error(undefined). %% get_module_info/1 --spec erlang:get_module_info(P1) -> [{atom(), [{atom(), term()}]}] when - P1 :: atom(). -get_module_info(_P1) -> +-spec erlang:get_module_info(Module) -> [{Item, term()}] when + Item :: module | exports | attributes | compile | native | md5, + Module :: atom(). +get_module_info(_Module) -> erlang:nif_error(undefined). %% get_stacktrace/0 @@ -1882,10 +1883,12 @@ element(_N, _Tuple) -> erlang:nif_error(undefined). %% Not documented +-type module_info_key() :: attributes | compile | exports | functions | md5 + | module | native | native_addresses. -spec erlang:get_module_info(Module, Item) -> ModuleInfo when Module :: atom(), - Item :: module | exports | functions | attributes | compile | native_addresses | md5, - ModuleInfo :: atom() | [] | [{atom(), arity()}] | [{atom(), term()}] | [{atom(), arity(), integer()}]. + Item :: module_info_key(), + ModuleInfo :: term(). get_module_info(_Module, _Item) -> erlang:nif_error(undefined). |