25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00

Merge branch '3.0.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 3.0.x

This commit is contained in:
Alexey Shchepin 2012-10-30 14:18:32 +02:00
commit 37d3a4e1f5

View File

@ -1070,15 +1070,17 @@ pretty_sentence([Char | A], R) ->
pretty_sentence(A, [Char | R]).
pretty_binary([$>, $> | A], "") ->
{A, ">>" ++ "<<"};
{A, "\"\""};
pretty_binary([$>, $> | A], R) ->
{A, ">>" ++ io_lib:format("~p", [lists:reverse(R)]) ++ "<<"};
{A, io_lib:format("~p", [lists:reverse(R)])};
pretty_binary([$, | A], R) ->
pretty_binary(A, R);
pretty_binary([32 | A], R) ->
pretty_binary(A, R);
pretty_binary([$\n | A], R) ->
pretty_binary(A, R);
pretty_binary([$\t | A], R) ->
pretty_binary(A, R);
pretty_binary([Digit1, Digit2, Other | A], R) when (Other == $>) or (Other == $,) ->
Integer = list_to_integer([Digit1, Digit2]),
pretty_binary([Other | A], [Integer | R]);