diff options
| author | Björn Gustavsson <[email protected]> | 2011-10-27 12:27:33 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-10-27 12:27:33 +0200 |
| commit | a971c9568ccebed4e8d00abf52faa59a2bcc1c18 (patch) | |
| tree | 1a39c38bce2e27954ea772e80224069b41e5bcd9 /lib/inviso | |
| parent | 86e4b23fb4a11f18834e6b1be76642fbd71b9cf7 (diff) | |
| parent | 3e8720728abe875683ad54fa4d93ba83df609f57 (diff) | |
| download | otp-a971c9568ccebed4e8d00abf52faa59a2bcc1c18.tar.gz otp-a971c9568ccebed4e8d00abf52faa59a2bcc1c18.tar.bz2 otp-a971c9568ccebed4e8d00abf52faa59a2bcc1c18.zip | |
Merge branch 'bjorn/eliminate-regexp-usage'
* bjorn/eliminate-regexp-usage:
erl_tidy: Eliminate two references to 'regexp' in the documentation
erts/z_SUITE: Eliminate use of deprecated regexp module
erts/nt_SUITE: Eliminate use of deprecated regexp module
erl_html_tools: Eliminate mention of deprecated regexp module
erl_interface tests: Eliminate use of deprecated regexp module
tools test suite: Eliminate compilation warnings for the eed module
tools test suite: Eliminate use of deprecated regexp module
xmerl test suite: Eliminate use of deprecated regexp module
appmon: Eliminate use of deprecated regexp module
tv: Eliminate use of deprecated regexp module
gs: Eliminate use of deprecated regexp module
inviso: Eliminate use of deprecated regexp module
Diffstat (limited to 'lib/inviso')
| -rw-r--r-- | lib/inviso/src/inviso_tool_lib.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/inviso/src/inviso_tool_lib.erl b/lib/inviso/src/inviso_tool_lib.erl index 7953acedd6..f221c4b6de 100644 --- a/lib/inviso/src/inviso_tool_lib.erl +++ b/lib/inviso/src/inviso_tool_lib.erl @@ -19,7 +19,7 @@ %% Support module to the inviso tool.
%%
%% Authors:
-%% Lennart �hman, [email protected]
+%% Lennart Öhman, [email protected]
%% -----------------------------------------------------------------------------
-module(inviso_tool_lib).
@@ -145,10 +145,10 @@ expand_module_names_2(Nodes,DirStr,ModStr,Opts) -> %% Always returns a regexp or {error,Reason}.
expand_module_names_special_regexp(Str) ->
StrLen=length(Str),
- case regexp:first_match(Str,"[0-9a-zA-Z_/]*") of
- {match,1,StrLen} -> % Ok, it is the special case.
+ case re:run(Str,"[0-9a-zA-Z_/]*") of
+ {match,[{0,StrLen}]} -> % Ok, it is the special case.
{ok,".*"++Str++".*"}; % Convert it to a proper regexp.
- {match,_,_} ->
+ {match,_} ->
{ok,Str}; % Keep it and hope it is a regexp.
nomatch ->
{ok,Str}; % Keep it and hope it is a regexp.
|