Erlang client synched with Valentiono's repo

[redis.git] / client-libraries / erlang / src / proto.erl

diff --git a/client-libraries/erlang/src/proto.erl b/client-libraries/erlang/src/proto.erl
index ef0ace2720b834e7a9d9a2142d8c7572597edc64..1de6da8c782a8ac6cb08d61feb2e495a1c55df9a 100644 (file)
--- a/client-libraries/erlang/src/proto.erl
+++ b/client-libraries/erlang/src/proto.erl
@@ -1,68 +1,38 @@
 -module(proto).
 
 -module(proto).
 

--export([parse/2, parse_int/2, parse_types/2,
-        parse_string/2, stateful_parser/2,
-        single_stateful_parser/2, parse_special/2]).
-
+-export([parse/2]).

 
 parse(empty, "+OK") ->
     ok;
 parse(empty, "+PONG") ->
     pong;
 
 parse(empty, "+OK") ->
     ok;
 parse(empty, "+PONG") ->
     pong;

-parse(empty, "0") ->
+parse(empty, ":0") ->

     false;
     false;

-parse(empty, "1") ->
+parse(empty, ":1") ->

     true;
     true;

-parse(empty, "-1") ->
-    {error, no_such_key};
-parse(empty, "-2") ->
-    {error, wrong_type};
-parse(empty, "-3") ->
-    {error, same_db};
-parse(empty, "-4") ->
-    {error, argument_out_of_range};

 parse(empty, "-" ++ Message) ->
 parse(empty, "-" ++ Message) ->

-    {error, Message}.
-
-parse_special(empty, "-1") ->
-    parse(empty, "-1");
-parse_special(empty, "-2") ->
-    parse(empty, "-2");
-parse_special(empty, N) ->
-    list_to_integer(N).
-
-parse_int(empty, "-ERR " ++ Message) ->

     {error, Message};
     {error, Message};

-parse_int(empty, Value) ->
-    list_to_integer(Value).
-
-parse_string(empty, Message) ->
+parse(empty, "$-1") ->
+    {read, nil};
+parse(empty, "*-1") ->
+    {hold, nil};
+parse(empty, "$" ++ BulkSize) ->
+    {read, list_to_integer(BulkSize)};
+parse(read, "$" ++ BulkSize) ->
+    {read, list_to_integer(BulkSize)};
+parse(empty, "*" ++ MultiBulkSize) ->
+    {hold, list_to_integer(MultiBulkSize)};
+parse(empty, Message) ->
+    convert(Message).
+
+convert(":" ++ Message) ->
+    list_to_integer(Message);
+% in case the message is not OK or PONG it's a
+% real value that we don't know how to convert
+% to an atom, so just pass it as is and remove
+% the +
+convert("+" ++ Message) -> 
+    Message;
+convert(Message) ->

     Message.
 
     Message.
 

-parse_types(empty, "none") -> none;
-parse_types(empty, "string") -> string;
-parse_types(empty, "list") -> list;
-parse_types(empty, "set") -> set.
-
-
-% I'm used when redis returns multiple results
-stateful_parser(empty, "nil") ->
-    nil;
-stateful_parser(error, "-ERR " ++ Error) ->
-    {error, Error};
-stateful_parser(empty, "-" ++ _ErrorLength) ->
-    error;
-stateful_parser(empty, NumberOfElements) ->
-    {hold, list_to_integer(NumberOfElements)};
-stateful_parser(read, ElementSize) ->
-    {read, list_to_integer(ElementSize)}.
-
-% I'm used when redis returns just one result
-single_stateful_parser(empty, "nil") ->
-    nil;
-single_stateful_parser(error, "-ERR " ++ Error) ->
-    {error, Error};
-single_stateful_parser(empty, "-" ++ _ErrorLength) ->
-    error;
-single_stateful_parser(empty, ElementSize) ->
-    {read, list_to_integer(ElementSize)}.