diff options
| author | Björn Gustavsson <[email protected]> | 2010-10-04 15:47:06 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-10-04 15:47:06 +0200 |
| commit | 3cfec17ff7aff97c5ec862a8b9e97d245849f9c3 (patch) | |
| tree | 34c6d7ccd08d0312da1d83380de8defce62a4172 | |
| parent | 29a550156d88eb2899bceaa07c46369f97539336 (diff) | |
| parent | 7c64e547eff945059732384617676b1cafc11117 (diff) | |
| download | otp-3cfec17ff7aff97c5ec862a8b9e97d245849f9c3.tar.gz otp-3cfec17ff7aff97c5ec862a8b9e97d245849f9c3.tar.bz2 otp-3cfec17ff7aff97c5ec862a8b9e97d245849f9c3.zip | |
Merge branch 'ks/stdlib-spec-fixes' into dev
* ks/stdlib-spec-fixes:
Correct erroneous specs; strengthen some others
| -rw-r--r-- | lib/stdlib/src/gb_sets.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/src/lists.erl | 4 | ||||
| -rw-r--r-- | lib/stdlib/src/orddict.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/src/ordsets.erl | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdlib/src/gb_sets.erl b/lib/stdlib/src/gb_sets.erl index 086dc79b46..113f29e252 100644 --- a/lib/stdlib/src/gb_sets.erl +++ b/lib/stdlib/src/gb_sets.erl @@ -657,7 +657,7 @@ intersection_2([], _, As, S) -> intersection_2(_, [], As, S) -> {S, balance_revlist(As, S)}. --spec intersection([gb_set()]) -> gb_set(). +-spec intersection([gb_set(),...]) -> gb_set(). intersection([S | Ss]) -> intersection_list(S, Ss). diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl index 08ee595f4d..431e5b114e 100644 --- a/lib/stdlib/src/lists.erl +++ b/lib/stdlib/src/lists.erl @@ -350,7 +350,7 @@ sort_1(X, [], R) -> %% merge(List) -> L %% merges a list of sorted lists --spec merge([T]) -> [T]. +-spec merge([[T]]) -> [T]. merge(L) -> mergel(L, []). @@ -842,7 +842,7 @@ usort_1(X, []) -> %% umerge(List) -> L %% merges a list of sorted lists without duplicates, removes duplicates --spec umerge([T]) -> [T]. +-spec umerge([[T]]) -> [T]. umerge(L) -> umergel(L). diff --git a/lib/stdlib/src/orddict.erl b/lib/stdlib/src/orddict.erl index c7b52b933e..8a13992785 100644 --- a/lib/stdlib/src/orddict.erl +++ b/lib/stdlib/src/orddict.erl @@ -151,7 +151,7 @@ map(F, [{Key,Val}|D]) -> [{Key,F(Key, Val)}|map(F, D)]; map(F, []) when is_function(F, 2) -> []. --spec filter(fun((term(), term()) -> term()), orddict()) -> orddict(). +-spec filter(fun((term(), term()) -> boolean()), orddict()) -> orddict(). filter(F, [{Key,Val}=E|D]) -> case F(Key, Val) of diff --git a/lib/stdlib/src/ordsets.erl b/lib/stdlib/src/ordsets.erl index 05041c15f1..e992b66714 100644 --- a/lib/stdlib/src/ordsets.erl +++ b/lib/stdlib/src/ordsets.erl @@ -147,7 +147,7 @@ intersection(_, []) -> %% intersection([OrdSet]) -> OrdSet. %% Return the intersection of the list of ordered sets. --spec intersection([ordset(_)]) -> ordset(_). +-spec intersection([ordset(_),...]) -> ordset(_). intersection([S1,S2|Ss]) -> intersection1(intersection(S1, S2), Ss); |