diff options
| author | Björn Gustavsson <[email protected]> | 2016-01-28 12:24:44 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-01-28 12:24:44 +0100 |
| commit | df5be3657a7eca136632fddd3e11a5cc2d78a1d8 (patch) | |
| tree | d3bc1b045d6bf131846f1012e7b0b6752861c087 /lib/kernel/src | |
| parent | 6301ceeb265f68b417bb2ce58312e34b9557a294 (diff) | |
| parent | d8161c3ad977c0e20c075ecf58d8ac5769637828 (diff) | |
| download | otp-df5be3657a7eca136632fddd3e11a5cc2d78a1d8.tar.gz otp-df5be3657a7eca136632fddd3e11a5cc2d78a1d8.tar.bz2 otp-df5be3657a7eca136632fddd3e11a5cc2d78a1d8.zip | |
Merge branch 'maint'
* maint:
Update documentation for code-loading functions
code: Correct the types for error returns
Eliminate run-time system crash in code:load_abs/1
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/code.erl | 9 | ||||
| -rw-r--r-- | lib/kernel/src/code_server.erl | 9 |
2 files changed, 7 insertions, 11 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl index ae28c97b47..a82fc0f3d6 100644 --- a/lib/kernel/src/code.erl +++ b/lib/kernel/src/code.erl @@ -79,10 +79,9 @@ %%---------------------------------------------------------------------------- -type load_error_rsn() :: 'badfile' - | 'native_code' | 'nofile' | 'not_purged' - | 'on_load' + | 'on_load_failure' | 'sticky_directory'. -type load_ret() :: {'error', What :: load_error_rsn()} | {'module', Module :: module()}. @@ -137,14 +136,16 @@ load_file(Mod) when is_atom(Mod) -> -spec ensure_loaded(Module) -> {module, Module} | {error, What} when Module :: module(), - What :: embedded | badfile | native_code | nofile | on_load. + What :: embedded | badfile | nofile | on_load_failure. ensure_loaded(Mod) when is_atom(Mod) -> call({ensure_loaded,Mod}). %% XXX File as an atom is allowed only for backwards compatibility. -spec load_abs(Filename) -> load_ret() when Filename :: file:filename(). -load_abs(File) when is_list(File); is_atom(File) -> call({load_abs,File,[]}). +load_abs(File) when is_list(File); is_atom(File) -> + Mod = list_to_atom(filename:basename(File)), + call({load_abs,File,Mod}). %% XXX Filename is also an atom(), e.g. 'cover_compiled' -spec load_abs(Filename :: loaded_filename(), Module :: module()) -> load_ret(). diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl index 3fbbb98b94..e72f8fd1b9 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -278,7 +278,7 @@ handle_call(get_path, {_From,_Tag}, S) -> {reply,S#state.path,S}; %% Messages to load, delete and purge modules/files. -handle_call({load_abs,File,Mod}, Caller, S) -> +handle_call({load_abs,File,Mod}, Caller, S) when is_atom(Mod) -> case modp(File) of false -> {reply,{error,badarg},S}; @@ -1075,15 +1075,10 @@ modp(Atom) when is_atom(Atom) -> true; modp(List) when is_list(List) -> int_list(List); modp(_) -> false. -load_abs(File, Mod0, Caller, St) -> +load_abs(File, Mod, Caller, St) -> Ext = objfile_extension(), FileName0 = lists:concat([File, Ext]), FileName = absname(FileName0), - Mod = if Mod0 =:= [] -> - list_to_atom(filename:basename(FileName0, Ext)); - true -> - Mod0 - end, case erl_prim_loader:get_file(FileName) of {ok,Bin,_} -> try_load_module(FileName, Mod, Bin, Caller, St); |