aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-10-24 12:50:16 +0200
committerGitHub <[email protected]>2018-10-24 12:50:16 +0200
commitb50e4cfd3c48212642799e5a6be8d425a59e4b72 (patch)
tree4812bc5ea194b6c321a62f41cc4d710401463542 /lib
parent2b30ac551d3febf0233f26176f4706a009e840d2 (diff)
parent131ff5fac7da80fe8080425182bf29f673ab301c (diff)
downloadotp-b50e4cfd3c48212642799e5a6be8d425a59e4b72.tar.gz
otp-b50e4cfd3c48212642799e5a6be8d425a59e4b72.tar.bz2
otp-b50e4cfd3c48212642799e5a6be8d425a59e4b72.zip
Merge pull request #1992 from bjorng/bjorn/stdlib/beam_lib/ERL-696
beam_lib: Clarify the beam() type in code and documentation OTP-15378
Diffstat (limited to 'lib')
-rw-r--r--lib/hipe/main/hipe.erl2
-rw-r--r--lib/stdlib/doc/src/beam_lib.xml4
-rw-r--r--lib/stdlib/src/beam_lib.erl2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index ac2e6c1e3b..e2cb9c0f0b 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -542,7 +542,7 @@ file(File) ->
| {'error', term()}
when Mod :: mod().
file(File, Options) when is_atom(File) ->
- case beam_lib:info(File) of
+ case beam_lib:info(atom_to_list(File)) of
L when is_list(L) ->
{module, Mod} = lists:keyfind(module, 1, L),
case compile(Mod, File, Options) of
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index 26d0724aaf..213170df7f 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -180,8 +180,8 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
<name name="beam"/>
<desc>
<p>Each of the functions described below accept either the
- module name, the filename, or a binary containing the BEAM
- module.</p>
+ filename (as a string) or a binary containing the BEAM
+ module.</p>
</desc>
</datatype>
<datatype>
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 01181b1097..3386cfcbe6 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -53,7 +53,7 @@
%%-------------------------------------------------------------------------
--type beam() :: module() | file:filename() | binary().
+-type beam() :: file:filename() | binary().
-type debug_info() :: {DbgiVersion :: atom(), Backend :: module(), Data :: term()} | 'no_debug_info'.
-type forms() :: [erl_parse:abstract_form() | erl_parse:form_info()].