From 99484ce4f266f079e64e9a20930ecd46cbaf456d Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Sun, 20 Oct 2013 03:23:38 +0000 Subject: [PATCH] minor refactor of jsx_decoder --- src/jsx_decoder.erl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jsx_decoder.erl b/src/jsx_decoder.erl index e3587b4..4d29b96 100644 --- a/src/jsx_decoder.erl +++ b/src/jsx_decoder.erl @@ -590,21 +590,21 @@ string(<<_, Rest/binary>>, Handler, Acc, Stack, Config=#config{strict_utf8=false string(Bin, Handler, Acc, Stack, Config) -> ?error(string, Bin, Handler, Acc, Stack, Config). -doublequote(<>, Handler, Acc, [key|_] = Stack, Config) -> +doublequote(Rest, Handler, Acc, [key|_] = Stack, Config) -> colon(Rest, handle_event({key, end_seq(Acc, Config)}, Handler, Config), Stack, Config); -doublequote(<>, Handler, Acc, [singlequote|_] = Stack, Config) -> +doublequote(Rest, Handler, Acc, [singlequote|_] = Stack, Config) -> string(Rest, Handler,acc_seq(Acc, maybe_replace(?doublequote, Config)), Stack, Config); doublequote(<<>>, Handler, Acc, [singlequote|_] = Stack, Config) -> incomplete(string, <>, Handler, Acc, Stack, Config); -doublequote(<>, Handler, Acc, Stack, Config) -> +doublequote(Rest, Handler, Acc, Stack, Config) -> maybe_done(Rest, handle_event({string, end_seq(Acc, Config)}, Handler, Config), Stack, Config). -singlequote(<>, Handler, Acc, [singlequote, key|Stack], Config) -> +singlequote(Rest, Handler, Acc, [singlequote, key|Stack], Config) -> colon(Rest, handle_event({key, end_seq(Acc, Config)}, Handler, Config), [key|Stack], Config); -singlequote(<>, Handler, Acc, [singlequote|Stack], Config) -> +singlequote(Rest, Handler, Acc, [singlequote|Stack], Config) -> maybe_done(Rest, handle_event({string, end_seq(Acc, Config)}, Handler, Config), Stack, Config); -singlequote(<>, Handler, Acc, Stack, Config) -> +singlequote(Rest, Handler, Acc, Stack, Config) -> string(Rest, Handler, acc_seq(Acc, ?singlequote), Stack, Config).