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/erl_interface | |
| 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/erl_interface')
| -rw-r--r-- | lib/erl_interface/test/all_SUITE_data/init_tc.erl | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/lib/erl_interface/test/all_SUITE_data/init_tc.erl b/lib/erl_interface/test/all_SUITE_data/init_tc.erl index 8157d590fc..8db4667bf9 100644 --- a/lib/erl_interface/test/all_SUITE_data/init_tc.erl +++ b/lib/erl_interface/test/all_SUITE_data/init_tc.erl @@ -40,23 +40,11 @@ run([]) -> run1(Name) -> CFile = Name ++ ".c", {ok, Bin} = file:read_file(CFile), - String = binary_to_list(Bin), - - %% This ConstPart stuff is because you can't retrieve part of a match. - %% Long live Perl! - - ConstPart = "\nTESTCASE\\(", - ConstPartLen = 10, - {match, Matches} = regexp:matches(String, ConstPart++"[_a-zA-Z]*"), - Cases = get_names(Matches, ConstPartLen, Bin, []), + RE = "\nTESTCASE\\(([_a-zA-Z]*)\\)", + {match, Cases0} = re:run(Bin, RE, [{capture,all_but_first,list},global]), + Cases = lists:concat(Cases0), generate(Name, Cases). -get_names([{Start, Length}|Rest], Skip, Bin, Result) -> - Name = binary_to_list(Bin, Start+Skip, Start+Length-1), - get_names(Rest, Skip, Bin, [Name|Result]); -get_names([], _Skip, _Bin, Result) -> - lists:reverse(Result). - generate(TcName, Cases) -> Hrl = TcName ++ "_cases.hrl", {ok, HrlFile} = file:open(Hrl, write), |