diff options
author | Björn Gustavsson <[email protected]> | 2017-02-09 11:44:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2017-02-09 11:44:28 +0100 |
commit | aff4e82fce59e4eaefa84ed0d1dd5c40927637e5 (patch) | |
tree | 56dd7ab69e25ec36a20e95c7040cc5d54af8eb36 /lib/syntax_tools/src | |
parent | b4471746fbf987b44420aa350dc3c2a899e6f0a5 (diff) | |
parent | 1d886081027c4d4fcfbf7f73d4708694cad582f5 (diff) | |
download | otp-aff4e82fce59e4eaefa84ed0d1dd5c40927637e5.tar.gz otp-aff4e82fce59e4eaefa84ed0d1dd5c40927637e5.tar.bz2 otp-aff4e82fce59e4eaefa84ed0d1dd5c40927637e5.zip |
Merge pull request #1312 from richcarl/shell-smart-compile
Extend shell c(...) to find and recompile modules
OTP-14190
Diffstat (limited to 'lib/syntax_tools/src')
-rw-r--r-- | lib/syntax_tools/src/igor.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl index 72170ec5da..b92cd8d607 100644 --- a/lib/syntax_tools/src/igor.erl +++ b/lib/syntax_tools/src/igor.erl @@ -417,7 +417,7 @@ merge_files(Name, Files, Options) -> %% %% <dd>Specifies a list of rules for associating object files with %% source files, to be passed to the function -%% `filename:find_src/2'. This can be used to change the +%% `filelib:find_source/2'. This can be used to change the %% way Igor looks for source files. If this option is not specified, %% the default system rules are used. The first occurrence of this %% option completely overrides any later in the option list.</dd> @@ -462,7 +462,7 @@ merge_files(Name, Files, Options) -> %% @see merge/3 %% @see merge_files/3 %% @see merge_sources/3 -%% @see //stdlib/filename:find_src/2 +%% @see //stdlib/filelib:find_source/2 %% @see epp_dodger -spec merge_files(atom(), erl_syntax:forms(), [file:filename()], [option()]) -> @@ -2746,8 +2746,8 @@ read_module(Name, Options) -> %% It seems that we have no file - go on anyway, %% just to get a decent error message. read_module_1(Name, Options); - {Name1, _} -> - read_module_1(Name1 ++ ".erl", Options) + {ok, Name1} -> + read_module_1(Name1, Options) end end. @@ -2807,9 +2807,9 @@ check_forms([], _) -> ok. find_src(Name, undefined) -> - filename:find_src(filename(Name)); + filelib:find_source(filename(Name)); find_src(Name, Rules) -> - filename:find_src(filename(Name), Rules). + filelib:find_source(filename(Name), Rules). %% file_type(filename()) -> {value, Type} | none |