Remove all 'nil' and use 'null'

Author: kuenishi

src/msgpack.erl

@@ -26,7 +26,7 @@
 %%     <tr><th>    erlang    </th><th>                            msgpack                                      </th></tr>
 %%     <tr><td> integer()    </td><td> pos_fixnum/neg_fixnum/uint8/uint16/uint32/uint64/int8/int16/int32/int64 </td></tr>
 %%     <tr><td> float()      </td><td> float/double                                                            </td></tr>
-%%     <tr><td> nil          </td><td> nil                                                                     </td></tr>
+%%     <tr><td> null         </td><td> null                                                                    </td></tr>
 %%     <tr><td> boolean()    </td><td> boolean                                                                 </td></tr>
 %%     <tr><td> binary()     </td><td> fix_raw/raw16/raw32                                                     </td></tr>
 %%     <tr><td> list()       </td><td> fix_array/array16/array32                                               </td></tr>
@@ -168,15 +168,15 @@ parse_options([{ext, {Packer,Unpacker}}|TL], Opt0) when
 -ifdef(default_map).
 
 test_data()->
-    [true, false, nil,
+    [true, false, null,
      0, 1, 2, 123, 512, 1230, 678908, 16#FFFFFFFFFF,
      -1, -23, -512, -1230, -567898, -16#FFFFFFFFFF,
      -16#80000001,
      123.123, -234.4355, 1.0e-34, 1.0e64,
      [23, 234, 0.23],
      <<"hogehoge">>, <<"243546rf7g68h798j", 0, 23, 255>>,
      <<"hoasfdafdas][">>,
-     [0,42, <<"sum">>, [1,2]], [1,42, nil, [3]],
+     [0,42, <<"sum">>, [1,2]], [1,42, null, [3]],
      -234, -40000, -16#10000000, -16#100000000,
      42
     ].

src/msgpack_packer.erl

@@ -32,12 +32,7 @@ pack(I, _) when is_integer(I) ->
     pack_uint(I);
 pack(F, _) when is_float(F) ->
     pack_double(F);
-pack(null, _Opt = ?OPTION{interface=jsx}) ->
-    << 16#C0:8 >>;
-pack(null, _Opt = ?OPTION{interface=jiffy}) ->
-    << 16#C0:8 >>;
-pack(nil, _Opt = ?OPTION{interface=Interface}) 
-  when Interface =/= jsx andalso Interface =/= jiffy ->
+pack(null, _Opt) ->
     << 16#C0:8 >>;
 pack(false, _) ->
     << 16#C2:8 >>;

src/msgpack_unpacker.erl

@@ -29,12 +29,8 @@
 %% unpack them all
 -spec unpack_stream(Bin::binary(), msgpack_option()) -> {msgpack:object(), binary()} | no_return().
 %% ATOMS
-unpack_stream(<<16#C0, Rest/binary>>, _Opt = ?OPTION{interface=jsx}) ->
-    {null, Rest};
-unpack_stream(<<16#C0, Rest/binary>>, _Opt = ?OPTION{interface=jiffy}) ->
-    {null, Rest};
 unpack_stream(<<16#C0, Rest/binary>>, _) ->
-    {nil, Rest};
+    {null, Rest};
 unpack_stream(<<16#C2, Rest/binary>>, _) ->
     {false, Rest};
 unpack_stream(<<16#C3, Rest/binary>>, _) ->

test/msgpack_tests.erl

@@ -28,14 +28,14 @@
 -ifdef(DO_MSGPACK_CROSSLANG_TEST).
 
 test_data() ->
-    [true, false, nil,
+    [true, false, null,
      0, 1, 2, 123, 512, 1230, 678908, 16#FFFFFFFFFF,
      -1, -23, -512, -1230, -567898, -16#FFFFFFFFFF,
      123.123, -234.4355, 1.0e-34, 1.0e64,
      [23, 234, 0.23],
      <<"hogehoge">>, <<"243546rf7g68h798j", 0, 23, 255>>,
      <<"hoasfdafdas][">>,
-     [0,42, <<"sum">>, [1,2]], [1,42, nil, [3]],
+     [0,42, <<"sum">>, [1,2]], [1,42, null, [3]],
      -234, -40000, -16#10000000, -16#100000000,
      42].
 
@@ -97,8 +97,8 @@ unknown_test_freezed_test_dont_do_this()->
              123.123,
              -234.4355, 1.0e-34, 1.0e64,
              [23, 234, 0.23],
-             [0,42,<<"sum">>, [1,2]], [1,42, nil, [3]],
-             [{1,2},{<<"hoge">>,nil}], % map
+             [0,42,<<"sum">>, [1,2]], [1,42, null, [3]],
+             [{1,2},{<<"hoge">>,null}], % map
              -234, -50000,
              42
             ],
@@ -148,27 +148,18 @@ issue_jiffy_5_test() ->
 
 issue_27_test_() ->
     [
-     %% null(jiffy) => nil(msgpack) => null(jsx)
+     %% null(jiffy) => null(msgpack) => null(jsx)
      ?_assertEqual({ok, null},
                    msgpack:unpack(msgpack:pack(null, [{format,jiffy}]), [{format,jsx}])),
 
-     %% null(jiffy) => nil(msgpack) => null(jiffy)
+     %% null(jiffy) => null(msgpack) => null(jiffy)
      ?_assertEqual({ok, null},
                    msgpack:unpack(msgpack:pack(null, [{format,jiffy}]), [{format,jiffy}])),
 
 
-     %% null(jsx) => nil(msgpack) => null(jiffy)
+     %% null(jsx) => null(msgpack) => null(jiffy)
      ?_assertEqual({ok, null},
-                   msgpack:unpack(msgpack:pack(null, [{format,jsx}]), [{format,jiffy}])),
-
-     %% nil(jiffy-atom) => <<nil>>(msgpack-binary) => <<"nil">>
-     ?_assertEqual({ok, <<"nil">>},
-                   msgpack:unpack(msgpack:pack(nil, [{allow_atom,pack}, {format,jiffy}]), [{format,jiffy}])),
-
-     %% nil(jsx-atom) => <<nil>>(msgpack-binary) => <<"nil">>
-     ?_assertEqual({ok, <<"nil">>},
-                   msgpack:unpack(msgpack:pack(nil,
-                                               [{format,jsx},{allow_atom,pack}]), [{format,jiffy}]))].
+                   msgpack:unpack(msgpack:pack(null, [{format,jsx}]), [{format,jiffy}]))].
 
 string_test() ->
     {ok, CWD} = file:get_cwd(),