diff options
| author | Anders Svensson <[email protected]> | 2011-12-07 16:52:11 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-12-07 16:52:11 +0100 |
| commit | ac3cbe8bee6b826004c02a1d21f8093899716b33 (patch) | |
| tree | 0550844be1423b06c75c704af6bab056ffe69750 /lib/diameter/src | |
| parent | 6004f23e77856b8182fae699789b994e55691138 (diff) | |
| parent | 75fa191f9fc48a769e5f99f8dc6b9463d21c9e0c (diff) | |
| download | otp-ac3cbe8bee6b826004c02a1d21f8093899716b33.tar.gz otp-ac3cbe8bee6b826004c02a1d21f8093899716b33.tar.bz2 otp-ac3cbe8bee6b826004c02a1d21f8093899716b33.zip | |
Merge branch 'anders/diameter/suites_and_dialyzer/OTP-9781'
* anders/diameter/suites_and_dialyzer/OTP-9781:
Minor diameter_dict_scanner fix
Skip sctp tests on {error, esocktnosupport}
Ensure that TLS will be available in TLS suite
Diffstat (limited to 'lib/diameter/src')
| -rw-r--r-- | lib/diameter/src/compiler/diameter_dict_scanner.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/diameter/src/compiler/diameter_dict_scanner.erl b/lib/diameter/src/compiler/diameter_dict_scanner.erl index 963b58fdfc..45189376fb 100644 --- a/lib/diameter/src/compiler/diameter_dict_scanner.erl +++ b/lib/diameter/src/compiler/diameter_dict_scanner.erl @@ -32,7 +32,9 @@ %% # scan/1 %% ----------------------------------------------------------- --spec scan(string()) -> {ok, [Token]} | {error, {atom(), string(), Lineno}} +-spec scan(string() | binary()) + -> {ok, [Token]} + | {error, {string(), string(), Lineno}} when Token :: {word, Lineno, string()} | {number, Lineno, non_neg_integer()} | {Symbol, Lineno}, @@ -169,7 +171,7 @@ split([H|_] = L) when $a =< H, H =< $z; {word(P), Rest}; split([$'|T]) -> - case splitwith(fun(C) -> not lists:member(C, "'\r\n") end, T) of + case lists:splitwith(fun(C) -> not lists:member(C, "'\r\n") end, T) of {[_|_] = A, [$'|Rest]} -> {{word, A}, Rest}; {[], [$'|_]} -> |