diff --git a/erlang/OMakefile b/erlang/OMakefile deleted file mode 100644 index 21079400..00000000 --- a/erlang/OMakefile +++ /dev/null @@ -1,51 +0,0 @@ -######################################################################## -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this file, to deal in the File without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the File, and to permit persons to whom the -# File is furnished to do so, subject to the following condition: -# -# THE FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE FILE OR -# THE USE OR OTHER DEALINGS IN THE FILE. - -######################################################################## -# The standard OMakefile. -# You will usually need to modify this file for your project. - -######################################################################## -# Phony targets are scoped, so you probably want to declare them first. -# - -.PHONY: all clean test edoc dialyzer #install - -######################################################################## -# Subdirectories. -# You may want to include some subdirectories in this project. -# If so, define the subdirectory targets and uncomment this section. -# - -.DEFAULT: msgpack.beam - -msgpack.beam: msgpack.erl - erlc -Wall +debug_info $< - -msgpack.html: msgpack.erl - erl -noshell -run edoc_run file $< - -test: msgpack.beam - erl -noshell -s msgpack test -s init stop - -edoc: msgpack.erl - erl -noshell -eval 'ok=edoc:files(["msgpack.erl"], [{dir, "edoc"}]).' -s init stop - -dialyzer: msgpack.erl - dialyzer --src $< - -clean: - -rm -f *.beam *.html diff --git a/erlang/OMakeroot b/erlang/OMakeroot deleted file mode 100644 index 35c219da..00000000 --- a/erlang/OMakeroot +++ /dev/null @@ -1,45 +0,0 @@ -######################################################################## -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this file, to deal in the File without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the File, and to permit persons to whom the -# File is furnished to do so, subject to the following condition: -# -# THE FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE FILE OR -# THE USE OR OTHER DEALINGS IN THE FILE. - -######################################################################## -# The standard OMakeroot file. -# You will not normally need to modify this file. -# By default, your changes should be placed in the -# OMakefile in this directory. -# -# If you decide to modify this file, note that it uses exactly -# the same syntax as the OMakefile. -# - -# -# Include the standard installed configuration files. -# Any of these can be deleted if you are not using them, -# but you probably want to keep the Common file. -# -open build/C -open build/OCaml -open build/LaTeX - -# -# The command-line variables are defined *after* the -# standard configuration has been loaded. -# -DefineCommandVars() - -# -# Include the OMakefile in this directory. -# -.SUBDIRS: . diff --git a/erlang/README.md b/erlang/README.md index 8616d5ec..f78602e7 100644 --- a/erlang/README.md +++ b/erlang/README.md @@ -1,9 +1,5 @@ MessagePack for Erlang ====================== -Binary-based efficient object serialization library. -see wiki ( http://redmine.msgpack.org/projects/msgpack/wiki/QuickStartErlang ) for details - -# Status - -0.1.0 released. +This project has moved to its own repository for good usage in rebar. +New repository is http://github.com/msgpack/msgpack-erlang . diff --git a/erlang/edoc/.gitignore b/erlang/edoc/.gitignore deleted file mode 100644 index 97f4246c..00000000 --- a/erlang/edoc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.html -*.css -*.png -edoc-info diff --git a/erlang/msgpack.erl b/erlang/msgpack.erl deleted file mode 100644 index 8c85458e..00000000 --- a/erlang/msgpack.erl +++ /dev/null @@ -1,395 +0,0 @@ -%% -%% MessagePack for Erlang -%% -%% Copyright (C) 2009-2010 UENISHI Kota -%% -%% Licensed under the Apache License, Version 2.0 (the "License"); -%% you may not use this file except in compliance with the License. -%% You may obtain a copy of the License at -%% -%% http://www.apache.org/licenses/LICENSE-2.0 -%% -%% Unless required by applicable law or agreed to in writing, software -%% distributed under the License is distributed on an "AS IS" BASIS, -%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -%% See the License for the specific language governing permissions and -%% limitations under the License. - - -%% @doc MessagePack codec for Erlang. -%% -%% APIs are almost compatible with C API -%% except for buffering functions (both copying and zero-copying), which are unavailable. -%% -%% -%% -%% -%% -%% -%% -%% -%% -%% -%% -%%
Equivalence between Erlang and Msgpack type :
erlang msgpack
integer() pos_fixnum/neg_fixnum/uint8/uint16/uint32/uint64/int8/int16/int32/int64
float() float/double
nil nil
boolean() boolean
binary() fix_raw/raw16/raw32
list() fix_array/array16/array32
{proplist()} fix_map/map16/map32
-%% @end - --module(msgpack). --author('kuenishi+msgpack@gmail.com'). - --export([pack/1, unpack/1, unpack_all/1]). - -% @type msgpack_term() = [msgpack_term()] -% | {[{msgpack_term(),msgpack_term()}]} -% | integer() | float() | binary(). -% Erlang representation of msgpack data. --type msgpack_term() :: [msgpack_term()] - | {[{msgpack_term(),msgpack_term()}]} - | integer() | float() | binary(). - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% external APIs -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% @doc Encode an erlang term into an msgpack binary. -% Returns {error, {badarg, term()}} if the input is illegal. -% @spec pack(Term::msgpack_term()) -> binary() | {error, {badarg, term()}} --spec pack(Term::msgpack_term()) -> binary() | {error, {badarg, term()}}. -pack(Term)-> - try - pack_(Term) - catch - throw:Exception -> - {error, Exception} - end. - -% @doc Decode an msgpack binary into an erlang term. -% It only decodes the first msgpack packet contained in the binary; the rest is returned as is. -% Returns {error, {badarg, term()}} if the input is corrupted. -% Returns {error, incomplete} if the input is not a full msgpack packet (caller should gather more data and try again). -% @spec unpack(Bin::binary()) -> {msgpack_term(), binary()} | {error, incomplete} | {error, {badarg, term()}} --spec unpack(Bin::binary()) -> {msgpack_term(), binary()} | {error, incomplete} | {error, {badarg, term()}}. -unpack(Bin) when is_binary(Bin) -> - try - unpack_(Bin) - catch - throw:Exception -> - {error, Exception} - end; -unpack(Other) -> - {error, {badarg, Other}}. - -% @doc Decode an msgpack binary into an erlang terms. -% It only decodes ALL msgpack packets contained in the binary. No packets should not remain. -% Returns {error, {badarg, term()}} if the input is corrupted. -% Returns {error, incomplete} if the input is not a full msgpack packet (caller should gather more data and try again). -% @spec unpack_all(binary()) -> [msgpack_term()] | {error, incomplete} | {error, {badarg, term()}} --spec unpack_all(binary()) -> [msgpack_term()] | {error, incomplete} | {error, {badarg, term()}}. -unpack_all(Data)-> - try - unpack_all_(Data) - catch - throw:Exception -> - {error, Exception} - end. -unpack_all_(Data)-> - case unpack_(Data) of - { Term, <<>> } -> - [Term]; - { Term, Binary } when is_binary(Binary) -> - [Term|unpack_all_(Binary)] - end. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% internal APIs -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% pack them all --spec pack_(msgpack_term()) -> binary() | no_return(). -pack_(I) when is_integer(I) andalso I < 0 -> - pack_int_(I); -pack_(I) when is_integer(I) -> - pack_uint_(I); -pack_(F) when is_float(F) -> - pack_double(F); -pack_(nil) -> - << 16#C0:8 >>; -pack_(true) -> - << 16#C3:8 >>; -pack_(false) -> - << 16#C2:8 >>; -pack_(Bin) when is_binary(Bin) -> - pack_raw(Bin); -pack_(List) when is_list(List) -> - pack_array(List); -pack_({Map}) when is_list(Map) -> - pack_map(Map); -pack_(Other) -> - throw({badarg, Other}). - - --spec pack_uint_(non_neg_integer()) -> binary(). -% positive fixnum -pack_uint_(N) when N < 128 -> - << 2#0:1, N:7 >>; -% uint 8 -pack_uint_(N) when N < 256 -> - << 16#CC:8, N:8 >>; -% uint 16 -pack_uint_(N) when N < 65536 -> - << 16#CD:8, N:16/big-unsigned-integer-unit:1 >>; -% uint 32 -pack_uint_(N) when N < 16#FFFFFFFF-> - << 16#CE:8, N:32/big-unsigned-integer-unit:1 >>; -% uint 64 -pack_uint_(N) -> - << 16#CF:8, N:64/big-unsigned-integer-unit:1 >>. - --spec pack_int_(integer()) -> binary(). -% negative fixnum -pack_int_(N) when N >= -32-> - << 2#111:3, N:5 >>; -% int 8 -pack_int_(N) when N > -128 -> - << 16#D0:8, N:8/big-signed-integer-unit:1 >>; -% int 16 -pack_int_(N) when N > -32768 -> - << 16#D1:8, N:16/big-signed-integer-unit:1 >>; -% int 32 -pack_int_(N) when N > -16#FFFFFFFF -> - << 16#D2:8, N:32/big-signed-integer-unit:1 >>; -% int 64 -pack_int_(N) -> - << 16#D3:8, N:64/big-signed-integer-unit:1 >>. - - --spec pack_double(float()) -> binary(). -% float : erlang's float is always IEEE 754 64bit format. -% pack_float(F) when is_float(F)-> -% << 16#CA:8, F:32/big-float-unit:1 >>. -% pack_double(F). -% double -pack_double(F) -> - << 16#CB:8, F:64/big-float-unit:1 >>. - - --spec pack_raw(binary()) -> binary(). -% raw bytes -pack_raw(Bin) -> - case byte_size(Bin) of - Len when Len < 6-> - << 2#101:3, Len:5, Bin/binary >>; - Len when Len < 16#10000 -> % 65536 - << 16#DA:8, Len:16/big-unsigned-integer-unit:1, Bin/binary >>; - Len -> - << 16#DB:8, Len:32/big-unsigned-integer-unit:1, Bin/binary >> - end. - - --spec pack_array([msgpack_term()]) -> binary() | no_return(). -% list -pack_array(L) -> - case length(L) of - Len when Len < 16 -> - << 2#1001:4, Len:4/integer-unit:1, (pack_array_(L, <<>>))/binary >>; - Len when Len < 16#10000 -> % 65536 - << 16#DC:8, Len:16/big-unsigned-integer-unit:1, (pack_array_(L, <<>>))/binary >>; - Len -> - << 16#DD:8, Len:32/big-unsigned-integer-unit:1, (pack_array_(L, <<>>))/binary >> - end. - -pack_array_([], Acc) -> Acc; -pack_array_([Head|Tail], Acc) -> - pack_array_(Tail, <>). - -% Users SHOULD NOT send too long list: this uses lists:reverse/1 --spec unpack_array_(binary(), non_neg_integer(), [msgpack_term()]) -> {[msgpack_term()], binary()} | no_return(). -unpack_array_(Bin, 0, Acc) -> {lists:reverse(Acc), Bin}; -unpack_array_(Bin, Len, Acc) -> - {Term, Rest} = unpack_(Bin), - unpack_array_(Rest, Len-1, [Term|Acc]). - - --spec pack_map(M::[{msgpack_term(),msgpack_term()}]) -> binary() | no_return(). -pack_map(M)-> - case length(M) of - Len when Len < 16 -> - << 2#1000:4, Len:4/integer-unit:1, (pack_map_(M, <<>>))/binary >>; - Len when Len < 16#10000 -> % 65536 - << 16#DE:8, Len:16/big-unsigned-integer-unit:1, (pack_map_(M, <<>>))/binary >>; - Len -> - << 16#DF:8, Len:32/big-unsigned-integer-unit:1, (pack_map_(M, <<>>))/binary >> - end. - -pack_map_([], Acc) -> Acc; -pack_map_([{Key,Value}|Tail], Acc) -> - pack_map_(Tail, << Acc/binary, (pack_(Key))/binary, (pack_(Value))/binary>>). - -% Users SHOULD NOT send too long list: this uses lists:reverse/1 --spec unpack_map_(binary(), non_neg_integer(), [{msgpack_term(), msgpack_term()}]) -> - {{[{msgpack_term(), msgpack_term()}]}, binary()} | no_return(). -unpack_map_(Bin, 0, Acc) -> {{lists:reverse(Acc)}, Bin}; -unpack_map_(Bin, Len, Acc) -> - {Key, Rest} = unpack_(Bin), - {Value, Rest2} = unpack_(Rest), - unpack_map_(Rest2, Len-1, [{Key,Value}|Acc]). - -% unpack them all --spec unpack_(Bin::binary()) -> {msgpack_term(), binary()} | no_return(). -unpack_(Bin) -> - case Bin of -% ATOMS - <<16#C0, Rest/binary>> -> {nil, Rest}; - <<16#C2, Rest/binary>> -> {false, Rest}; - <<16#C3, Rest/binary>> -> {true, Rest}; -% Floats - <<16#CA, V:32/float-unit:1, Rest/binary>> -> {V, Rest}; - <<16#CB, V:64/float-unit:1, Rest/binary>> -> {V, Rest}; -% Unsigned integers - <<16#CC, V:8/unsigned-integer, Rest/binary>> -> {V, Rest}; - <<16#CD, V:16/big-unsigned-integer-unit:1, Rest/binary>> -> {V, Rest}; - <<16#CE, V:32/big-unsigned-integer-unit:1, Rest/binary>> -> {V, Rest}; - <<16#CF, V:64/big-unsigned-integer-unit:1, Rest/binary>> -> {V, Rest}; -% Signed integers - <<16#D0, V:8/signed-integer, Rest/binary>> -> {V, Rest}; - <<16#D1, V:16/big-signed-integer-unit:1, Rest/binary>> -> {V, Rest}; - <<16#D2, V:32/big-signed-integer-unit:1, Rest/binary>> -> {V, Rest}; - <<16#D3, V:64/big-signed-integer-unit:1, Rest/binary>> -> {V, Rest}; -% Raw bytes - <<16#DA, L:16/unsigned-integer-unit:1, V:L/binary, Rest/binary>> -> {V, Rest}; - <<16#DB, L:32/unsigned-integer-unit:1, V:L/binary, Rest/binary>> -> {V, Rest}; -% Arrays - <<16#DC, L:16/big-unsigned-integer-unit:1, Rest/binary>> -> unpack_array_(Rest, L, []); - <<16#DD, L:32/big-unsigned-integer-unit:1, Rest/binary>> -> unpack_array_(Rest, L, []); -% Maps - <<16#DE, L:16/big-unsigned-integer-unit:1, Rest/binary>> -> unpack_map_(Rest, L, []); - <<16#DF, L:32/big-unsigned-integer-unit:1, Rest/binary>> -> unpack_map_(Rest, L, []); - -% Tag-encoded lengths (kept last, for speed) - <<0:1, V:7, Rest/binary>> -> {V, Rest}; % positive int - <<2#111:3, V:5, Rest/binary>> -> {V - 2#100000, Rest}; % negative int - <<2#101:3, L:5, V:L/binary, Rest/binary>> -> {V, Rest}; % raw bytes - <<2#1001:4, L:4, Rest/binary>> -> unpack_array_(Rest, L, []); % array - <<2#1000:4, L:4, Rest/binary>> -> unpack_map_(Rest, L, []); % map - -% Invalid data - <> when F==16#C1; - F==16#C4; F==16#C5; F==16#C6; F==16#C7; F==16#C8; F==16#C9; - F==16#D4; F==16#D5; F==16#D6; F==16#D7; F==16#D8; F==16#D9 -> - throw({badarg, <>}); -% Incomplete data (we've covered every complete/invalid case; anything left is incomplete) - _ -> - throw(incomplete) - end. - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% unit tests -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --include_lib("eunit/include/eunit.hrl"). --ifdef(EUNIT). - -compare_all([], [])-> ok; -compare_all([], R)-> {toomuchrhs, R}; -compare_all(L, [])-> {toomuchlhs, L}; -compare_all([LH|LTL], [RH|RTL]) -> - ?assertEqual(LH, RH), - compare_all(LTL, RTL). - -port_receive(Port) -> - port_receive(Port, <<>>). -port_receive(Port, Acc) -> - receive - {Port, {data, Data}} -> port_receive(Port, <>); - {Port, eof} -> Acc - after 1000 -> Acc - end. - -test_([]) -> 0; -test_([Term|Rest])-> - Pack = msgpack:pack(Term), - ?assertEqual({Term, <<>>}, msgpack:unpack( Pack )), - 1+test_(Rest). - -test_data()-> - [true, false, nil, - 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]], - -234, -40000, -16#10000000, -16#100000000, - 42 - ]. - -basic_test()-> - Tests = test_data(), - Passed = test_(Tests), - Passed = length(Tests). - -port_test()-> - Tests = test_data(), - ?assertEqual({[Tests],<<>>}, msgpack:unpack(msgpack:pack([Tests]))), - - Port = open_port({spawn, "ruby ../test/crosslang.rb"}, [binary, eof]), - true = port_command(Port, msgpack:pack(Tests)), - ?assertEqual({Tests, <<>>}, msgpack:unpack(port_receive(Port))), - port_close(Port). - -test_p(Len,Term,OrigBin,Len) -> - {Term, <<>>}=msgpack:unpack(OrigBin); -test_p(I,_,OrigBin,Len) when I < Len-> - <> = OrigBin, - ?assertEqual({error,incomplete}, msgpack:unpack(Bin)). - -partial_test()-> % error handling test. - Term = lists:seq(0, 45), - Bin=msgpack:pack(Term), - BinLen = byte_size(Bin), - [test_p(X, Term, Bin, BinLen) || X <- lists:seq(0,BinLen)]. - -long_test()-> - Longer = lists:seq(0, 655), - {Longer, <<>>} = msgpack:unpack(msgpack:pack(Longer)). - -map_test()-> - Ints = lists:seq(0, 65), - Map = {[ {X, X*2} || X <- Ints ] ++ [{<<"hage">>, 324}, {43542, [nil, true, false]}]}, - {Map2, <<>>} = msgpack:unpack(msgpack:pack(Map)), - ?assertEqual(Map, Map2), - ok. - -unknown_test()-> - Port = open_port({spawn, "ruby testcase_generator.rb"}, [binary, eof]), - Tests = [0, 1, 2, 123, 512, 1230, 678908, - -1, -23, -512, -1230, -567898, - <<"hogehoge">>, <<"243546rf7g68h798j">>, - 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 - -234, -50000, - 42 - ], - ?assertEqual(ok, compare_all(Tests, msgpack:unpack_all(port_receive(Port)))), - port_close(Port). - -other_test()-> - ?assertEqual({error,incomplete},msgpack:unpack(<<>>)). - -benchmark_test()-> - Data=[test_data() || _ <- lists:seq(0, 10000)], - S=?debugTime(" serialize", msgpack:pack(Data)), - {Data,<<>>}=?debugTime("deserialize", msgpack:unpack(S)), - ?debugFmt("for ~p KB test data.", [byte_size(S) div 1024]). - -error_test()-> - ?assertEqual({error,{badarg, atom}}, msgpack:pack(atom)), - Term = {"hoge", "hage", atom}, - ?assertEqual({error,{badarg, Term}}, msgpack:pack(Term)). - --endif. diff --git a/erlang/testcase_generator.rb b/erlang/testcase_generator.rb deleted file mode 100644 index 8445bdd5..00000000 --- a/erlang/testcase_generator.rb +++ /dev/null @@ -1,65 +0,0 @@ -begin -require 'rubygems' -rescue LoadError -end -require 'msgpack' - -def usage - puts < (default: stdout) - -EOF - exit 1 -end - -code = 1 -outio = $stdout - -if ARGV.length > 2 - usage -end - -if fname = ARGV[0] - unless fname == "-" - begin - outio = File.open(fname, "w") - rescue - puts "can't open output file: #{$!}" - exit 1 - end - end -end - -objs = [0, 1, 2, 123, 512, 1230, 678908, - -1, -23, -512, -1230, -567898, - "hogehoge", "243546rf7g68h798j", - 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 }, - -234, -50000, - 42 - ] -begin - objs.each do |obj| - outio.write MessagePack.pack(obj) - outio.flush - end -rescue EOFError - code=0 -rescue - $stderr.puts $! - code=1 -end - -outio.close -exit code -