diff options
| author | Sverker Eriksson <[email protected]> | 2018-01-29 16:02:17 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-01-29 16:02:17 +0100 |
| commit | 184db040e4fca5eacd7150098d77c4d5829d6c52 (patch) | |
| tree | 67d1c08f7b54de9eaa8962cd208edb2b73425141 | |
| parent | db9e04d0f4337a2b32376a41275ecedfe0258c1f (diff) | |
| parent | b6175a41f90f2a0d2d56ec84fa5b4fcf74366d1c (diff) | |
| download | otp-184db040e4fca5eacd7150098d77c4d5829d6c52.tar.gz otp-184db040e4fca5eacd7150098d77c4d5829d6c52.tar.bz2 otp-184db040e4fca5eacd7150098d77c4d5829d6c52.zip | |
Merge branch 'sverker/ets-match_spec_run-spec/OTP-14889' into maint
| -rw-r--r-- | lib/stdlib/doc/src/ets.xml | 6 | ||||
| -rw-r--r-- | lib/stdlib/src/ets.erl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 576959b1c8..51e35cd2df 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -963,11 +963,11 @@ ets:is_compiled_ms(Broken).</code> <func> <name name="match_spec_run" arity="2"/> <fsummary>Perform matching, using a compiled match specification on a - list of tuples.</fsummary> + list of terms.</fsummary> <desc> <p>Executes the matching specified in a compiled <seealso marker="#match_spec">match specification</seealso> on a list - of tuples. Term <c><anno>CompiledMatchSpec</anno></c> is to be + of terms. Term <c><anno>CompiledMatchSpec</anno></c> is to be the result of a call to <seealso marker="#match_spec_compile/1"> <c>match_spec_compile/1</c></seealso> and is hence the internal representation of the match specification one wants to use.</p> @@ -985,7 +985,7 @@ Table = ets:new... MatchSpec = ... % The following call... ets:match_spec_run(ets:tab2list(Table), -ets:match_spec_compile(MatchSpec)), + ets:match_spec_compile(MatchSpec)), % ...gives the same result as the more common (and more efficient) ets:select(Table, MatchSpec),</code> <note> diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl index 1db004c91e..42fa8ede92 100644 --- a/lib/stdlib/src/ets.erl +++ b/lib/stdlib/src/ets.erl @@ -277,7 +277,7 @@ match_spec_compile(_) -> erlang:nif_error(undef). -spec match_spec_run_r(List, CompiledMatchSpec, list()) -> list() when - List :: [tuple()], + List :: [term()], CompiledMatchSpec :: comp_match_spec(). match_spec_run_r(_, _, _) -> @@ -517,7 +517,7 @@ update_element(_, _, _) -> -opaque comp_match_spec() :: reference(). -spec match_spec_run(List, CompiledMatchSpec) -> list() when - List :: [tuple()], + List :: [term()], CompiledMatchSpec :: comp_match_spec(). match_spec_run(List, CompiledMS) -> |