umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

remove cases from clean_string

Browse source
This commit is contained in:
alisdair sullivan 2013-02-24 02:42:29 -08:00
parent 82b7044d42
commit ef566d8cd3
2 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/jsx_encoder.erl
View file

@ -53,12 +53,7 @@ start(Term, {Handler, State}, Config) ->
value(String, {Handler, State}, Config) when is_binary(String) -> value(String, {Handler, State}, Config) when is_binary(String) ->
case clean_string(String, Config) of Handler:handle_event({string, clean_string(String, Config)}, State);
{error, badarg} ->
?error([String, {Handler, State}, Config]);
CleanString ->
Handler:handle_event({string, CleanString}, State)
end;
value(Float, {Handler, State}, _Config) when is_float(Float) -> value(Float, {Handler, State}, _Config) when is_float(Float) ->
Handler:handle_event({float, Float}, State); Handler:handle_event({float, Float}, State);
value(Int, {Handler, State}, _Config) when is_integer(Int) -> value(Int, {Handler, State}, _Config) when is_integer(Int) ->

21
src/jsx_parser.erl
View file

@ -101,19 +101,9 @@ value([Number|Tokens], Handler, Stack, Config) when is_integer(Number) ->
value([Number|Tokens], Handler, Stack, Config) when is_float(Number) -> value([Number|Tokens], Handler, Stack, Config) when is_float(Number) ->
value([{float, Number}] ++ Tokens, Handler, Stack, Config); value([{float, Number}] ++ Tokens, Handler, Stack, Config);
value([{string, String}|Tokens], Handler, [], Config) when is_binary(String) -> value([{string, String}|Tokens], Handler, [], Config) when is_binary(String) ->
case clean_string(String, Config) of done(Tokens, handle_event({string, clean_string(String, Config)}, Handler, Config), [], Config);
{error, badarg} ->
?error([[{string, String}|Tokens], Handler, [], Config]);
CleanString ->
done(Tokens, handle_event({string, CleanString}, Handler, Config), [], Config)
end;
value([{string, String}|Tokens], Handler, Stack, Config) when is_binary(String) -> value([{string, String}|Tokens], Handler, Stack, Config) when is_binary(String) ->
case clean_string(String, Config) of maybe_done(Tokens, handle_event({string, clean_string(String, Config)}, Handler, Config), Stack, Config);
{error, badarg} ->
?error([[{string, String}|Tokens], Handler, Stack, Config]);
CleanString ->
maybe_done(Tokens, handle_event({string, CleanString}, Handler, Config), Stack, Config)
end;
value([String|Tokens], Handler, Stack, Config) when is_binary(String) -> value([String|Tokens], Handler, Stack, Config) when is_binary(String) ->
value([{string, String}] ++ Tokens, Handler, Stack, Config); value([{string, String}] ++ Tokens, Handler, Stack, Config);
value([], Handler, Stack, Config) -> value([], Handler, Stack, Config) ->
@ -126,12 +116,7 @@ value(Token, Handler, Stack, Config) ->
object([end_object|Tokens], Handler, [object|Stack], Config) -> object([end_object|Tokens], Handler, [object|Stack], Config) ->
maybe_done(Tokens, handle_event(end_object, Handler, Config), Stack, Config); maybe_done(Tokens, handle_event(end_object, Handler, Config), Stack, Config);
object([{key, Key}|Tokens], Handler, Stack, Config) when is_atom(Key); is_binary(Key) -> object([{key, Key}|Tokens], Handler, Stack, Config) when is_atom(Key); is_binary(Key) ->
case clean_string(fix_key(Key), Config) of value(Tokens, handle_event({key, clean_string(fix_key(Key), Config)}, Handler, Config), Stack, Config);
{error, badarg} ->
?error([[{key, Key}|Tokens], Handler, Stack, Config]);
CleanString ->
value(Tokens, handle_event({key, CleanString}, Handler, Config), Stack, Config)
end;
object([Key|Tokens], Handler, Stack, Config) when is_atom(Key); is_binary(Key) -> object([Key|Tokens], Handler, Stack, Config) when is_atom(Key); is_binary(Key) ->
object([{key, Key}] ++ Tokens, Handler, Stack, Config); object([{key, Key}] ++ Tokens, Handler, Stack, Config);
object([], Handler, Stack, Config) -> object([], Handler, Stack, Config) ->