Merge pull request #337 from redboltz/fix_55

Fixed #55

.gitignore

@@ -0,0 +1,48 @@
+# Files generated by the bootstrap script.
+/INSTALL
+/NEWS
+/README
+/ac/
+/aclocal.m4
+/autom4te.cache/
+/config.h.in
+/configure
+/msgpack_vc2008.sln
+/msgpack_vc2008.vcproj
+Makefile.in
+
+# Files generated by the configure script.
+
+/config.h
+/config.log
+/config.status
+/libtool
+/msgpack.pc
+/src/msgpack/version.h
+/stamp-h1
+Makefile
+.deps
+.libs
+
+# Files generated by make.
+*.o
+*.so
+*.lo
+*.la
+
+# Files generated by make check.
+# TODO: Replace these with something like /test/*_test
+/test/buffer
+/test/cases
+/test/convert
+/test/fixint
+/test/fixint_c
+/test/msgpack_test
+/test/msgpackc_test
+/test/object
+/test/pack_unpack
+/test/pack_unpack_c
+/test/streaming
+/test/streaming_c
+/test/version
+/test/zone

.travis.yml

@@ -0,0 +1,25 @@
+language: cpp
+cache:
+  - apt
+compiler:
+  - clang
+  - gcc
+before_install:
+# We need this line to have g++4.8 available in apt
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update -qq
+  - sudo apt-get update
+  - sudo apt-get install valgrind
+  - sudo apt-get install libgtest-dev
+  - "cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/ ; cd -"
+install:
+  - sudo apt-get install -qq gcc-4.8 g++-4.8
+# We want to compile with g++ 4.8 when rather than the default g++
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
+
+env:
+  - ACTION="ci/build_autotools.sh" PARAM="cpp03"
+  - ACTION="ci/build_cmake.sh"     PARAM="cpp03"
+
+script:
+  - git clean -xdf && ${ACTION} ${PARAM}

CMakeLists.txt

@@ -0,0 +1,193 @@
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.6)
+PROJECT (msgpack)
+
+SET (VERSION 0.5.9)
+SET (VERSION_MAJOR 0)
+SET (VERSION_MINOR 5)
+
+SET (prefix ${CMAKE_INSTALL_PREFIX})
+SET (exec_prefix "\${prefix}")
+SET (libdir "\${exec_prefix}/lib")
+SET (includedir "\${prefix}/include")
+
+FIND_PACKAGE (GTest)
+FIND_PACKAGE (ZLIB)
+FIND_PACKAGE (Threads)
+IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND)
+	OPTION (MSGPACK_BUILD_TESTS "Build msgpack tests." ON)
+ENDIF ()
+
+OPTION (MSGPACK_ENABLE_CXX "Enable C++ interface." ON)
+
+INCLUDE (CheckCXXSourceCompiles)
+CHECK_CXX_SOURCE_COMPILES ("
+#include <bits/atomicity.h>
+int atomic_sub(int i) { return __gnu_cxx::__exchange_and_add(&i, -1) - 1; }
+int atomic_add(int i) { return __gnu_cxx::__exchange_and_add(&i, 1) + 1; }
+int main(int argc, char * argv[])
+{
+	atomic_sub(1);
+	atomic_add(1);
+}
+" MSGPACK_ENABLE_GCC_CXX_ATOMIC)
+
+IF (MSGPACK_ENABLE_CXX)
+	LIST (APPEND msgpack_SOURCES
+		src/object.cpp
+	)
+ENDIF ()
+
+IF (MSGPACK_ENABLE_GCC_CXX_ATOMIC)
+	LIST (APPEND msgpack_SOURCES
+		src/gcc_atomic.cpp
+	)
+ENDIF ()
+
+
+LIST (APPEND msgpack_SOURCES
+	src/unpack.c
+	src/objectc.c
+	src/version.c
+	src/vrefbuffer.c
+	src/zone.c
+)
+
+LIST (APPEND msgpack_HEADERS
+	src/msgpack/pack_define.h
+	src/msgpack/pack_template.h
+	src/msgpack/unpack_define.h
+	src/msgpack/unpack_template.h
+	src/msgpack/sysdep.h
+	src/msgpack/sbuffer.h
+	src/msgpack/version.h
+	src/msgpack/vrefbuffer.h
+	src/msgpack/zbuffer.h
+	src/msgpack/fbuffer.h
+	src/msgpack/pack.h
+	src/msgpack/unpack.h
+	src/msgpack/object.h
+	src/msgpack/zone.h
+)
+
+IF (MSGPACK_ENABLE_CXX)
+	LIST (APPEND msgpack_HEADERS
+		src/msgpack.hpp
+		src/msgpack/sbuffer.hpp
+		src/msgpack/vrefbuffer.hpp
+		src/msgpack/zbuffer.hpp
+		src/msgpack/fbuffer.hpp
+		src/msgpack/pack.hpp
+		src/msgpack/unpack.hpp
+		src/msgpack/object.hpp
+		src/msgpack/zone.hpp
+		src/msgpack/type.hpp
+		src/msgpack/type/bool.hpp
+		src/msgpack/type/deque.hpp
+		src/msgpack/type/float.hpp
+		src/msgpack/type/fixint.hpp
+		src/msgpack/type/int.hpp
+		src/msgpack/type/list.hpp
+		src/msgpack/type/map.hpp
+		src/msgpack/type/nil.hpp
+		src/msgpack/type/pair.hpp
+		src/msgpack/type/raw.hpp
+		src/msgpack/type/set.hpp
+		src/msgpack/type/string.hpp
+		src/msgpack/type/vector.hpp
+		src/msgpack/type/tuple.hpp
+		src/msgpack/type/define.hpp
+		src/msgpack/type/tr1/unordered_map.hpp
+		src/msgpack/type/tr1/unordered_set.hpp
+	)
+ENDIF ()
+
+EXECUTE_PROCESS (
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack
+)
+
+CONFIGURE_FILE (
+	src/msgpack/version.h.in
+	${CMAKE_CURRENT_BINARY_DIR}/src/msgpack/version.h
+)
+
+CONFIGURE_FILE (
+	msgpack.pc.in
+	msgpack.pc
+	@ONLY
+)
+
+INCLUDE_DIRECTORIES (
+	./
+	src/
+	src/msgpack/
+	${CMAKE_CURRENT_BINARY_DIR}/src/
+	${CMAKE_CURRENT_BINARY_DIR}/src/msgpack/
+)
+
+ADD_LIBRARY (msgpack SHARED
+	${msgpack_SOURCES}
+	${msgpack_HEADERS}
+)
+
+ADD_LIBRARY (msgpack-static STATIC
+	${msgpack_SOURCES}
+	${msgpack_HEADERS}
+)
+
+SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
+SET_TARGET_PROPERTIES (msgpack PROPERTIES IMPORT_SUFFIX "_import.lib")
+SET_TARGET_PROPERTIES (msgpack PROPERTIES SOVERSION 3 VERSION 3.0.0)
+
+IF (MSGPACK_BUILD_TESTS)
+	ENABLE_TESTING ()
+	ADD_SUBDIRECTORY (test)
+ENDIF ()
+
+IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3 -DPIC")
+	SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3" )
+ENDIF ()
+IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+	IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+		STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+	ELSE ()
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+	ENDIF ()
+ENDIF ()
+
+IF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
+	SET(CMAKE_INSTALL_LIBDIR lib)
+ENDIF ()
+
+INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+INSTALL (DIRECTORY src/msgpack DESTINATION include)
+INSTALL (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack DESTINATION include)
+INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+# Doxygen
+FIND_PACKAGE (Doxygen)
+IF (DOXYGEN_FOUND)
+	ADD_CUSTOM_TARGET (
+		doxygen_c
+		COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+		COMMAND ${CMAKE_COMMAND} -E echo "FILE_PATTERNS      = *.h" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+		COMMAND ${CMAKE_COMMAND} -E echo "OUTPUT_DIRECTORY   = doc_c" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+		COMMAND ${CMAKE_COMMAND} -E echo "PROJECT_NAME       = \"MessagePack for C\"" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
+		VERBATIM
+	)
+	ADD_CUSTOM_TARGET (
+		doxygen_cpp
+		COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+		COMMAND ${CMAKE_COMMAND} -E echo "FILE_PATTERNS      = *.hpp" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+		COMMAND ${CMAKE_COMMAND} -E echo "OUTPUT_DIRECTORY   = doc_cpp" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+		COMMAND ${CMAKE_COMMAND} -E echo "PROJECT_NAME       = \"MessagePack for C++\"" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
+		VERBATIM
+	)
+	ADD_CUSTOM_TARGET (
+		doxygen
+		DEPENDS doxygen_c doxygen_cpp
+	)
+ENDIF ()

ChangeLog

@@ -0,0 +1,72 @@
+2014-07-02 version 0.5.9:
+
+  * Support std::tr1 unordered containers by default (#51, #63, #68, #69)
+  * Remove some warnings (#56)
+  * Fix segmentation fault after malloc failures (#58, #59)
+  * Fix alloc/dealloc mismatch (#52, #61)
+  * Fix sample codes (#60, #64)
+  * Support implicit conversion from integer to float/double (#54)
+  * Improve documents (#45, #75, #82, #83)
+  * Support CMake (#20, #87)
+  * Remove Ruby dependencies in bootstrap (#86, #87)
+  * Add FILE* buffer (#40)
+  * Other bug fixes and refactoring: #39, #73, #77, #79, #80, #81, #84, #90
+
+2013-12-23 version 0.5.8:
+
+  * Move to the new github repository msgpack/msgpack-c
+  * Support the new deserialization specification
+  * fixes the problem of unpack helpers for array and map with 32bit compilers (#37, #38)
+  * Other bug fixes and refactoring: #46, #41, #36, #35, #33, #32, #30, #29, #28, #27, #26, #25, #8, #3
+  * Update of documents: #23, #18, #17
+
+2011-08-08 version 0.5.7:
+
+  * fixes compile error problem with llvm-gcc and Mac OS X Lion
+
+2011-04-24 version 0.5.6:
+
+  * #42 fixes double-free problem on msgpack_unpacker_release_zone
+
+2011-02-24 version 0.5.5:
+
+  * eliminates dependency of winsock2.h header
+  * fixes msgpack_vc.postbuild.bat file
+  * fixes some implicit cast warnings
+
+2010-08-29 version 0.5.4:
+
+  * includes msgpack_vc2008.vcproj file in source package
+  * fixes type::fix_int types
+
+2010-08-27 version 0.5.3:
+
+  * adds type::fix_{u,}int{8,16,32,64} types
+  * adds msgpack_pack_fix_{u,}int{8,16,32,64} functions
+  * adds packer<Stream>::pack_fix_{u,}int{8,16,32,64} functions
+  * fixes include paths
+
+2010-07-14 version 0.5.2:
+
+  * type::raw::str(), operator==, operator!=, operator< and operator> are now const
+  * generates version.h using AC_OUTPUT macro in ./configure
+
+2010-07-06 version 0.5.1:
+
+  * Add msgpack_vrefbuffer_new and msgpack_vrefbuffer_free
+  * Add msgpack_sbuffer_new and msgpack_sbuffer_free
+  * Add msgpack_unpacker_next and msgpack_unpack_next
+  * msgpack::unpack returns void
+  * Add MSGPACK_VERSION{,_MAJOR,_MINOR} macros to check header version
+  * Add msgpack_version{,_major,_minor} functions to check library version
+  * ./configure supports --disable-cxx option not to build C++ API
+
+2010-04-29 version 0.5.0:
+
+  * msgpack_object_type is changed. MSGPACK_OBJECT_NIL is now 0x00.
+  * New safe streaming deserializer API.
+  * Add object::object(const T&) and object::operator=(const T&)
+  * Add operator==(object, const T&)
+  * MSGPACK_DEFINE macro defines msgpack_object(object* obj, zone* z)
+  * C++ programs doesn't need to link "msgpackc" library.
+

Makefile.am

@@ -0,0 +1,21 @@
+SUBDIRS = src test
+
+DOC_FILES = \
+		README.md \
+		LICENSE \
+		NOTICE \
+		msgpack_vc8.vcproj \
+		msgpack_vc8.sln \
+		msgpack_vc.postbuild.bat
+
+EXTRA_DIST = \
+		$(DOC_FILES) CMakeLists.txt test/CMakeLists.txt
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = msgpack.pc
+
+doxygen:
+	./preprocess clean
+	cd src && $(MAKE) doxygen
+	./preprocess
+

QUICKSTART-C.md

@@ -0,0 +1,194 @@
+# Implementation Status
+
+The serialization library is production-ready.
+
+Currently, no RPC implementation is not available.
+
+# Install
+
+
+## Mac OS X with MacPorts
+
+On Mac OS X, you can install MessagePack for C using MacPorts.
+
+```
+$ sudo port install msgpack
+```
+
+You might need to run `sudo port selfupdate` before installing to update the package repository.
+
+You can also install via Homebrew.
+
+```
+$ sudo brew install msgpack
+```
+
+## FreeBSD with Ports Collection
+
+On FreeBSD, you can use Ports Collection. Install [net/msgpack|http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/msgpack/] package.
+
+## Gentoo Linux with Portage
+
+On Gentoo Linux, you can use emerge. Install [dev-libs/msgpack|http://gentoo-portage.com/dev-libs/msgpack] package.
+
+## Other UNIX-like platform with ./configure
+
+On the other UNIX-like platforms, download source package from [Releases|http://msgpack.org/releases/cpp/] and run `./configure && make && make install`.
+
+```
+$ wget http://msgpack.org/releases/cpp/msgpack-0.5.5.tar.gz
+$ tar zxvf msgpack-0.5.5.tar.gz
+$ cd msgpack-0.5.5
+$ ./configure
+$ make
+$ sudo make install
+```
+
+## Windows
+
+On Windows, download source package from [here|https://sourceforge.net/projects/msgpack/files/] and extract it.
+Then open `msgpack_vc8.vcproj` file and build it using batch build. It builds libraries on `lib/` folder and header files on `include/` folder.
+
+You can build using command line as follows:
+
+```
+> vcbuild msgpack_vc2008.vcproj
+> dir lib       % DLL files are here
+> dir include   % header files are here
+```
+
+## Install from git repository
+
+You need to install gcc (4.1.0 or higher), autotools.
+
+```
+$ git clone git@github.com:msgpack/msgpack.git
+$ cd msgpack/cpp
+$ ./bootstrap
+$ ./configure
+$ make
+$ sudo make install
+```
+
+# Serialization QuickStart for C
+
+## First program
+
+Include `msgpack.h` header and link `msgpack` library to use MessagePack on your program.
+
+```c
+#include <msgpack.h>
+#include <stdio.h>
+
+int main(void) {
+
+        /* creates buffer and serializer instance. */
+        msgpack_sbuffer* buffer = msgpack_sbuffer_new();
+        msgpack_packer* pk = msgpack_packer_new(buffer, msgpack_sbuffer_write);
+
+        /* serializes ["Hello", "MessagePack"]. */
+        msgpack_pack_array(pk, 2);
+        msgpack_pack_raw(pk, 5);
+        msgpack_pack_raw_body(pk, "Hello", 5);
+        msgpack_pack_raw(pk, 11);
+        msgpack_pack_raw_body(pk, "MessagePack", 11);
+
+        /* deserializes it. */
+        msgpack_unpacked msg;
+        msgpack_unpacked_init(&msg);
+        bool success = msgpack_unpack_next(&msg, buffer->data, buffer->size, NULL);
+
+        /* prints the deserialized object. */
+        msgpack_object obj = msg.data;
+        msgpack_object_print(stdout, obj);  /*=> ["Hello", "MessagePack"] */
+
+        /* cleaning */
+        msgpack_sbuffer_free(buffer);
+        msgpack_packer_free(pk);
+}
+```
+
+## Simple program with a loop
+
+```c
+#include <msgpack.h>
+#include <stdio.h>
+
+int main(void) {
+
+        /* creates buffer and serializer instance. */
+        msgpack_sbuffer* buffer = msgpack_sbuffer_new();
+        msgpack_packer* pk = msgpack_packer_new(buffer, msgpack_sbuffer_write);
+        
+        int j;
+
+        for(j = 0; j<23; j++) {
+           /* NB: the buffer needs to be cleared on each iteration */
+           msgpack_sbuffer_clear(buffer);
+
+           /* serializes ["Hello", "MessagePack"]. */
+           msgpack_pack_array(pk, 3);
+           msgpack_pack_raw(pk, 5);
+           msgpack_pack_raw_body(pk, "Hello", 5);
+           msgpack_pack_raw(pk, 11);
+           msgpack_pack_raw_body(pk, "MessagePack", 11);
+           msgpack_pack_int(pk, j);
+
+           /* deserializes it. */
+           msgpack_unpacked msg;
+           msgpack_unpacked_init(&msg);
+           bool success = msgpack_unpack_next(&msg, buffer->data, buffer->size, NULL);
+
+           /* prints the deserialized object. */
+           msgpack_object obj = msg.data;
+           msgpack_object_print(stdout, obj);  /*=> ["Hello", "MessagePack"] */
+           puts("");
+        }
+
+        /* cleaning */
+        msgpack_sbuffer_free(buffer);
+        msgpack_packer_free(pk);
+}
+```
+
+## Streaming feature
+
+```c
+#include <msgpack.h>
+#include <stdio.h>
+
+int main(void) {
+        /* serializes multiple objects using msgpack_packer. */
+        msgpack_sbuffer* buffer = msgpack_sbuffer_new();
+        msgpack_packer* pk = msgpack_packer_new(buffer, msgpack_sbuffer_write);
+        msgpack_pack_int(pk, 1);
+        msgpack_pack_int(pk, 2);
+        msgpack_pack_int(pk, 3);
+
+        /* deserializes these objects using msgpack_unpacker. */
+        msgpack_unpacker pac;
+        msgpack_unpacker_init(&pac, MSGPACK_UNPACKER_INIT_BUFFER_SIZE);
+
+        /* feeds the buffer. */
+        msgpack_unpacker_reserve_buffer(&pac, buffer->size);
+        memcpy(msgpack_unpacker_buffer(&pac), buffer->data, buffer->size);
+        msgpack_unpacker_buffer_consumed(&pac, buffer->size);
+
+        /* now starts streaming deserialization. */
+        msgpack_unpacked result;
+        msgpack_unpacked_init(&result);
+
+        while(msgpack_unpacker_next(&pac, &result)) {
+            msgpack_object_print(stdout, result.data);
+            puts("");
+        }
+
+        /* results:
+         * $ gcc stream.cc -lmsgpack -o stream
+         * $ ./stream
+         * 1
+         * 2
+         * 3
+         */
+}
+```

QUICKSTART-CPP.md

@@ -0,0 +1,159 @@
+# Implementation Status
+
+The serialization library is production-ready.
+
+Currently, RPC implementation is testing phase. Requires newer kernel, not running on RHEL5/CentOS5.
+
+# Install
+
+Same as QuickStart for C Language.
+
+# Serialization QuickStart for C+\+
+
+## First program
+
+Include `msgpack.hpp` header and link `msgpack` library to use MessagePack on your program.
+
+```cpp
+#include <msgpack.hpp>
+#include <vector>
+#include <string>
+#include <iostream>
+
+int main(void) {
+        // serializes this object.
+        std::vector<std::string> vec;
+        vec.push_back("Hello");
+        vec.push_back("MessagePack");
+
+        // serialize it into simple buffer.
+        msgpack::sbuffer sbuf;
+        msgpack::pack(sbuf, vec);
+
+        // deserialize it.
+        msgpack::unpacked msg;
+        msgpack::unpack(&msg, sbuf.data(), sbuf.size());
+
+        // print the deserialized object.
+        msgpack::object obj = msg.get();
+        std::cout << obj << std::endl;  //=> ["Hello", "MessagePack"]
+
+        // convert it into statically typed object.
+        std::vector<std::string> rvec;
+        obj.convert(&rvec);
+}
+```
+
+Compile it as follows:
+
+```
+$ g++ hello.cc -lmsgpack -o hello
+$ ./hello
+["Hello", "MessagePack"]
+```
+
+## Streaming feature
+
+```cpp
+#include <msgpack.hpp>
+#include <iostream>
+#include <string>
+
+int main(void) {
+        // serializes multiple objects using msgpack::packer.
+        msgpack::sbuffer buffer;
+
+        msgpack::packer<msgpack::sbuffer> pk(&buffer);
+        pk.pack(std::string("Log message ... 1"));
+        pk.pack(std::string("Log message ... 2"));
+        pk.pack(std::string("Log message ... 3"));
+
+        // deserializes these objects using msgpack::unpacker.
+        msgpack::unpacker pac;
+
+        // feeds the buffer.
+        pac.reserve_buffer(buffer.size());
+        memcpy(pac.buffer(), buffer.data(), buffer.size());
+        pac.buffer_consumed(buffer.size());
+
+        // now starts streaming deserialization.
+        msgpack::unpacked result;
+        while(pac.next(&result)) {
+            std::cout << result.get() << std::endl;
+        }
+
+        // results:
+        // $ g++ stream.cc -lmsgpack -o stream
+        // $ ./stream
+        // "Log message ... 1"
+        // "Log message ... 2"
+        // "Log message ... 3"
+}
+```
+
+### Streaming into an array or map
+
+```cpp
+#include <msgpack.hpp>
+#include <iostream>
+#include <string>
+
+int main(void) {
+        // serializes multiple objects into one message containing an array using msgpack::packer.
+        msgpack::sbuffer buffer;
+
+        msgpack::packer<msgpack::sbuffer> pk(&buffer);
+        pk.pack_array(3);
+        pk.pack(std::string("Log message ... 1"));
+        pk.pack(std::string("Log message ... 2"));
+        pk.pack(std::string("Log message ... 3"));
+
+        // serializes multiple objects into one message containing a map using msgpack::packer.
+        msgpack::sbuffer buffer2;
+
+        msgpack::packer<msgpack::sbuffer> pk2(&buffer2);
+        pk2.pack_map(2);
+        pk2.pack(std::string("x"));
+        pk2.pack(3);
+        pk2.pack(std::string("y"));
+        pk2.pack(3.4321);
+
+}
+```
+
+
+## User-defined classes
+
+You can use serialize/deserializes user-defined classes using `MSGPACK_DEFINE` macro.
+
+```cpp
+#include <msgpack.hpp>
+#include <vector>
+#include <string>
+
+class myclass {
+private:
+    std::string m_str;
+    std::vector<int> m_vec;
+public:
+    MSGPACK_DEFINE(m_str, m_vec);
+};
+
+int main(void) {
+        std::vector<myclass> vec;
+        // add some elements into vec...
+
+        // you can serialize myclass directly
+        msgpack::sbuffer sbuf;
+        msgpack::pack(sbuf, vec);
+
+        msgpack::unpacked msg;
+        msgpack::unpack(&msg, sbuf.data(), sbuf.size());
+
+        msgpack::object obj = msg.get();
+
+        // you can convert object to myclass directly
+        std::vector<myclass> rvec;
+        obj.convert(&rvec);
+}
+```

README.md

@@ -1,37 +1,161 @@
-MessagePack
-===========
-Extremely efficient object serialization library. It's like JSON, but very fast and small.
+# Msgpack for C/C++
+
+It's like JSON but small and fast.
 
 
-## What's MessagePack?
+## Overview
 
-MessagePack is a binary-based efficient object serialization library. It enables to exchange structured objects between many languages like JSON. But unlike JSON, it is very fast and small.
-
-Typical small integer (like flags or error code) is saved only in 1 byte, and typical short string only needs 1 byte except the length of the string itself. \[1,2,3\] (3 elements array) is serialized in 4 bytes using MessagePack as follows:
-
-    require 'msgpack'
-    msg = [1,2,3].to_msgpack  #=> "\x93\x01\x02\x03"
-    MessagePack.unpack(msg)   #=> [1,2,3]
+MessagePack is an efficient binary serialization format. It lets you exchange data among multiple languages like JSON. But it's faster and smaller. Small integers are encoded into a single byte, and typical short strings require only one extra byte in addition to the strings themselves.
 
 
-## Performance
+## License
 
-![Serialization + Deserialization Speed Test](http://msgpack.sourceforge.net/index/speedtest.png)
-
-In this test, it measured the elapsed time of serializing and deserializing 200,000 target objects. The target object consists of the three integers and 512 bytes string.
-The source code of this test is available from [frsyuki' serializer-speed-test repository.](http://github.com/frsyuki/serializer-speed-test)
+Msgpack is Copyright (C) 2008-2010 FURUHASHI Sadayuki and licensed under the Apache License, Version 2.0 (the "License"). For details see the `COPYING` file in this directory.
 
 
-## Getting Started
+## Contributing
 
-Usage and other documents about implementations in each language are found at [the web site.](http://msgpack.sourceforge.net/)
+The source for msgpack-c is held at [msgpack-c](https://github.com/msgpack/msgpack-c) github.com site.
+
+To report an issue, use the [msgpack-c issue tracker](https://github.com/msgpack/msgpack-c/issues) at github.com.
+
+## Version
+0.5.9 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c)
+
+## Using Msgpack
+
+### Building and Installing
+
+#### Install from git repository
+
+##### Using autotools
+You will need gcc (4.1.0 or higher), autotools.
+
+```
+$ git clone https://github.com/msgpack/msgpack-c.git
+$ cd msgpack-c
+$ ./bootstrap
+$ ./configure
+$ make
+$ sudo make install
+```
+
+##### Using cmake
+You will need gcc (4.1.0 or higher), cmake.
+
+```
+$ git clone https://github.com/msgpack/msgpack-c.git
+$ cd msgpack-c
+$ cmake .
+$ make
+```
+
+#### Install from package
+
+##### UNIX-like platform with ./configure
+
+On typical UNIX-like platforms, download source package from [Releases](https://github.com/msgpack/msgpack-c/releases) and run `./configure && make && make install`. Example:
+
+```
+$ wget https://github.com/msgpack/msgpack-c/releases/download/cpp-0.5.9/msgpack-0.5.9.tar.gz
+$ tar zxvf msgpack-0.5.9.tar.gz
+$ cd msgpack-0.5.9
+$ ./configure
+$ make
+$ sudo make install
+```
+
+##### FreeBSD with Ports Collection
+
+On FreeBSD, you can use Ports Collection. Install [net/msgpack](http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/msgpack/) package.
+
+##### Gentoo Linux with Portage
+
+On Gentoo Linux, you can use emerge. Install [dev-libs/msgpack](http://gentoo-portage.com/dev-libs/msgpack) package.
+
+##### Mac OS X with MacPorts
+
+On Mac OS X, you can install MessagePack for C using MacPorts.
+
+```
+$ sudo port install msgpack
+```
+
+You might need to run `sudo port selfupdate` before installing to update the package repository.
+
+You can also install via Homebrew.
+
+```
+$ sudo brew install msgpack
+```
 
 
-## Learn More
+##### Windows
 
-  - [Project Web Site](http://msgpack.sourceforge.net/)
-  - [MessagePack format specification](http://msgpack.sourceforge.net/spec)
-  - [Repository at github](http://github.com/msgpack/msgpack)
-  - [Wiki](http://msgpack.sourceforge.net/start)
-  - [MessagePack-RPC](http://github.com/msgpack/msgpack-rpc)
+Clone msgpack-c git repository.
 
+```
+$ git clone https://github.com/msgpack/msgpack-c.git
+```
+
+or using GUI git client.
+
+e.g.) tortoise git https://code.google.com/p/tortoisegit/
+
+Launch cmake GUI client. http://www.cmake.org/cmake/resources/software.html
+
+Set 'Where is the source code:' text box and 'Where to build the binaries:' text box.
+
+Click 'Configure' button.
+
+Choose your Visual Studio version.
+
+Click 'Generate' button.
+
+Open the created msgpack.sln on Visual Studio.
+
+Build all.
+
+### Linking with an Application
+
+Include `msgpack.hpp` (or `msgpack.h` for C) in your application and link with libmsgpack. Here is a typical gcc link command:
+
+    g++ myapp.cpp -lmsgpack -o myapp
+
+
+### Code Example
+```CPP
+#include <msgpack.hpp>
+#include <vector>
+#include <string>
+#include <iostream>
+
+int main() {
+    // This is target object.
+    std::vector<std::string> target;
+    target.push_back("Hello,");
+    target.push_back("World!");
+
+    // Serialize it.
+    msgpack::sbuffer sbuf;  // simple buffer
+    msgpack::pack(&sbuf, target);
+
+    // Deserialize the serialized data.
+    msgpack::unpacked msg;    // includes memory pool and deserialized object
+    msgpack::unpack(&msg, sbuf.data(), sbuf.size());
+    msgpack::object obj = msg.get();
+
+    // Print the deserialized object to stdout.
+    std::cout << obj << std::endl;    // ["Hello," "World!"]
+
+    // Convert the deserialized object to staticaly typed object.
+    std::vector<std::string> result;
+    obj.convert(&result);
+
+    // If the type is mismatched, it throws msgpack::type_error.
+    obj.as<int>();  // type is mismatched, msgpack::type_error is thrown
+}
+```
+### Quickstart Guides
+
+For more detailed examples see [QuickStart for C](QUICKSTART-C.md) and [QuickStart for C++](QUICKSTART-CPP.md).

README_crosslang.md

@@ -0,0 +1,38 @@
+MessagePack cross-language test cases
+=====================================
+
+## cases
+
+Valid serialized data are stored in "cases.mpac" and "cases_compact.mpac".
+These files describe same objects. And "cases.json" describes an array of the described objects.
+
+Thus you can verify your implementations as comparing the objects.
+
+
+## crosslang
+
+The *crosslang* tool reads serialized data from stdin and writes re-serialize data to stdout.
+
+There are C++ and Ruby implementation of crosslang tool. You can verify your implementation
+as comparing that implementations.
+
+### C++ version
+
+    $ cd ../cpp && ./configure && make && make install
+    or
+    $ port install msgpack  # MacPorts
+    
+    $ g++ -Wall crosslang.cc -lmsgpack -o crosslang
+
+    $ ./crosslang
+    Usage: ./crosslang [in-file] [out-file]
+
+### Ruby version
+
+    $ gem install msgpack
+    or
+    $ port install rb_msgpack   # MacPorts
+
+    $ ruby crosslang.rb
+    Usage: crosslang.rb [in-file] [out-file]
+

bootstrap

@@ -38,12 +38,6 @@ test -f ChangeLog || touch ChangeLog
 test -f NEWS      || touch NEWS
 test -f README    || cp -f README.md README
 
-if ! ./preprocess; then
-	exit 1
-fi
-
-
-
 ACLOCAL="aclocal"
 ACLOCAL_FILES="aclocal.m4"
 ALWAYS_CLEAN="config.status config.log config.cache libtool"

cases.json

@@ -0,0 +1 @@
+[false,true,null,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,127,127,255,65535,4294967295,-32,-32,-128,-32768,-2147483648,0.0,-0.0,1.0,-1.0,"a","a","a","","","",[0],[0],[0],[],[],[],{},{},{},{"a":97},{"a":97},{"a":97},[[]],[["a"]]]

cases_gen.rb

@@ -0,0 +1,99 @@
+#
+# MessagePack format test case
+#
+begin
+require 'rubygems'
+rescue LoadError
+end
+require 'msgpack'
+require 'json'
+
+source = <<EOF
+c2                          # false
+c3                          # true
+c0                          # nil
+00                          # 0 Positive FixNum
+cc 00                       # 0 uint8
+cd 00 00                    # 0 uint16
+ce 00 00 00 00              # 0 uint32
+cf 00 00 00 00 00 00 00 00  # 0 uint64
+d0 00                       # 0 int8
+d1 00 00                    # 0 int16
+d2 00 00 00 00              # 0 int32
+d3 00 00 00 00 00 00 00 00  # 0 int64
+ff                          # -1 Negative FixNum
+d0 ff                       # -1 int8
+d1 ff ff                    # -1 int16
+d2 ff ff ff ff              # -1 int32
+d3 ff ff ff ff ff ff ff ff  # -1 int64
+7f                          # 127 Positive FixNum
+cc 7f                       # 127 uint8
+cd 00 ff                    # 255 uint16
+ce 00 00 ff ff              # 65535 uint32
+cf 00 00 00 00 ff ff ff ff  # 4294967295 uint64
+e0                          # -32 Negative FixNum
+d0 e0                       # -32 int8
+d1 ff 80                    # -128 int16
+d2 ff ff 80 00              # -32768 int32
+d3 ff ff ff ff 80 00 00 00  # -2147483648 int64
+#ca 00 00 00 00              # 0.0 float
+cb 00 00 00 00 00 00 00 00  # 0.0 double
+#ca 80 00 00 00              # -0.0 float
+cb 80 00 00 00 00 00 00 00  # -0.0 double
+cb 3f f0 00 00 00 00 00 00  # 1.0 double
+cb bf f0 00 00 00 00 00 00  # -1.0 double
+a1 61                       # "a" FixRaw
+da 00 01 61                 # "a" raw 16
+db 00 00 00 01 61           # "a" raw 32
+a0                          # "" FixRaw
+da 00 00                    # "" raw 16
+db 00 00 00 00              # "" raw 32
+91 00                       # [0] FixArray
+dc 00 01 00                 # [0] array 16
+dd 00 00 00 01 00           # [0] array 32
+90                          # [] FixArray
+dc 00 00                    # [] array 16
+dd 00 00 00 00              # [] array 32
+80                          # {} FixMap
+de 00 00                    # {} map 16
+df 00 00 00 00              # {} map 32
+81 a1 61 61                 # {"a"=>97} FixMap
+de 00 01 a1 61 61           # {"a"=>97} map 16
+df 00 00 00 01 a1 61 61     # {"a"=>97} map 32
+91 90                       # [[]]
+91 91 a1 61                 # [["a"]]
+EOF
+
+source.gsub!(/\#.+$/,'')
+bytes = source.strip.split(/\s+/).map {|x| x.to_i(16) }.pack('C*')
+
+objs = []
+compact_bytes = ""
+
+pac = MessagePack::Unpacker.new
+pac.feed(bytes)
+pac.each {|obj|
+	p obj
+	objs << obj
+	compact_bytes << obj.to_msgpack
+}
+
+json = objs.to_json
+
+# self check
+cpac = MessagePack::Unpacker.new
+cpac.feed(compact_bytes)
+cpac.each {|cobj|
+	obj = objs.shift
+	if obj != cobj
+		puts "** SELF CHECK FAILED **"
+		puts "expected: #{obj.inspect}"
+		puts "actual: #{cobj.inspect}"
+		exit 1
+	end
+}
+
+File.open("cases.mpac","w") {|f| f.write(bytes) }
+File.open("cases_compact.mpac","w") {|f| f.write(compact_bytes) }
+File.open("cases.json","w") {|f| f.write(json) }
+

ci/build_autotools.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+./bootstrap
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+if [ $1 = "cpp11" ]
+then
+    ./configure CXXFLAGS="-std=c++11"
+else
+    ./configure
+fi
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make check
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make install DESTDIR=`pwd`/install
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+exit 0

ci/build_cmake.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+
+mkdir build
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+cd build
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+if [ $1 = "cpp11" ]
+then
+  cmake -DMSGPACK_CXX11=ON ..
+else
+  cmake  ..
+fi
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make test
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+make install DESTDIR=`pwd`/install
+
+ret=$?
+if [ $ret -ne 0 ]
+then
+    exit $ret
+fi
+
+exit 0

configure.in

@@ -0,0 +1,100 @@
+AC_INIT(src/object.cpp)
+AC_CONFIG_AUX_DIR(ac)
+AM_INIT_AUTOMAKE(msgpack, 0.5.9)
+AC_CONFIG_HEADER(config.h)
+
+AC_SUBST(CFLAGS)
+CFLAGS="-O3 -Wall $CFLAGS"
+
+AC_SUBST(CXXFLAGS)
+CXXFLAGS="-O3 -Wall $CXXFLAGS"
+
+
+AC_PROG_CC
+
+
+AC_MSG_CHECKING([if C++ API is enabled])
+AC_ARG_ENABLE(cxx,
+	AS_HELP_STRING([--disable-cxx],
+				   [don't build C++ API]) )   #'
+AC_MSG_RESULT([$enable_cxx])
+if test "$enable_cxx" != "no"; then
+	AC_PROG_CXX
+	AM_PROG_CC_C_O
+fi
+AM_CONDITIONAL(ENABLE_CXX, test "$enable_cxx" != "no")
+
+
+AC_PROG_LIBTOOL
+AM_PROG_AS
+
+
+AC_MSG_CHECKING([if debug option is enabled])
+AC_ARG_ENABLE(debug,
+	AS_HELP_STRING([--disable-debug],
+				   [disable assert macros and omit -g option]) )
+AC_MSG_RESULT([$enable_debug])
+if test "$enable_debug" != "no"; then
+	CXXFLAGS="$CXXFLAGS -g"
+	CFLAGS="$CFLAGS -g"
+else
+	CXXFLAGS="$CXXFLAGS -DNDEBUG"
+	CFLAGS="$CFLAGS -DNDEBUG"
+fi
+
+
+AC_CACHE_CHECK([for __sync_* atomic operations], msgpack_cv_atomic_ops, [
+	AC_TRY_LINK([
+		int atomic_sub(int i) { return __sync_sub_and_fetch(&i, 1); }
+		int atomic_add(int i) { return __sync_add_and_fetch(&i, 1); }
+	], [atomic_sub(1); atomic_add(1);], msgpack_cv_atomic_ops="yes")
+	])
+if test "$msgpack_cv_atomic_ops" != "yes"; then
+	if test "$enable_cxx" = "no"; then
+		AC_MSG_ERROR([__sync_* atomic operations are not found. Try to enable C++ support.
+If you are using gcc >= 4.1 and the default target CPU architecture is "i386", try to
+add CFLAGS="-march=i686" and CXXFLAGS="-march=i686" options to ./configure as follows:
+
+  $ ./configure CFLAGS="-march=i686" CXXFLAGS="-march=i686"
+					  ])
+	fi
+
+	AC_LANG_PUSH([C++])
+	AC_CACHE_CHECK([for __gnu_cxx::__exchange_and_add], msgpack_cv_gcc_cxx_atomic_ops, [
+		AC_TRY_LINK([
+			#include <bits/atomicity.h>
+			int atomic_sub(int i) { return __gnu_cxx::__exchange_and_add(&i, -1) - 1; }
+			int atomic_add(int i) { return __gnu_cxx::__exchange_and_add(&i, 1) + 1; }
+		], [atomic_sub(1); atomic_add(1);], msgpack_cv_gcc_cxx_atomic_ops="yes")
+		])
+	AC_LANG_POP([C++])
+
+	if test "$msgpack_cv_gcc_cxx_atomic_ops" != "yes"; then
+		AC_MSG_ERROR([__sync_* atomic operations nor __gnu_cxx::__exchange_and_add are not found.
+
+If you are using gcc >= 4.1 and the default target CPU architecture is "i386", try to
+add CFLAGS="-march=i686" and CXXFLAGS="-march=i686" options to ./configure as follows:
+
+  $ ./configure CFLAGS="-march=i686" CXXFLAGS="-march=i686"
+])
+
+	else
+		enable_gcc_cxx_atomic=yes
+	fi
+fi
+
+AM_CONDITIONAL(ENABLE_GCC_CXX_ATOMIC, test "$enable_gcc_cxx_atomic" = "yes")
+
+
+major=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+minor=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+AC_SUBST(VERSION_MAJOR, $major)
+AC_SUBST(VERSION_MINOR, $minor)
+
+
+AC_OUTPUT([Makefile
+		   msgpack.pc
+		   src/Makefile
+		   src/msgpack/version.h
+		   test/Makefile])
+

cpp/ChangeLog

@@ -1,10 +0,0 @@
-
-2010-04-29 version 0.5.0:
-
-  * msgpack_object_type is changed. MSGPACK_OBJECT_NIL is now 0x00.
-  * New safe streaming deserializer API.
-  * Add object::object(const T&) and object::operator=(const T&)
-  * Add operator==(object, const T&)
-  * MSGPACK_DEFINE macro defines msgpack_object(object* obj, zone* z)
-  * C++ programs doesn't need to link "msgpackc" library.
-

cpp/README.md

@@ -1,78 +0,0 @@
-MessagePack for C/C++
-=====================
-Binary-based efficient object serialization library.
-
-
-## Installation
-
-Download latest package from [releases of MessagePack](http://sourceforge.net/projects/msgpack/files/) and extract it.
-
-On UNIX-like platform, run ./configure && make && sudo make install:
-
-    $ ./configure
-    $ make
-    $ sudo make install
-
-On Windows, open msgpack_vc8.vcproj file and build it using batch build. DLLs are built on lib folder, and the headers are built on include folder.
-
-To use the library in your program, include msgpack.hpp header and link msgpack and msgpackc library.
-
-
-## Example
-
-    #include <msgpack.hpp>
-    #include <vector>
-    
-    int main(void) {
-        // This is target object.
-        std::vector<std::string> target;
-        target.push_back("Hello,");
-        target.push_back("World!");
-    
-        // Serialize it.
-        msgpack::sbuffer buffer;  // simple buffer
-        msgpack::pack(&buffer, target);
-    
-        // Deserialize the serialized data.
-        msgpack::zone mempool;    // this manages the life of deserialized object
-        msgpack::object obj;
-        msgpack::unpack_return ret =
-                msgpack::unpack(buffer.data, buffer.size, NULL, &mempool, &obj);
-    
-        if(ret != msgapck::UNPACK_SUCCESS) {
-            // error check
-            exit(1);
-        }
-    
-        // Print the deserialized object to stdout.
-        std::cout << obj << std::endl;    // ["Hello," "World!"]
-    
-        // Convert the deserialized object to staticaly typed object.
-        std::vector<std::string> result;
-        obj.convert(&result);
-    
-        // If the type is mismatched, it throws msgpack::type_error.
-        obj.as<int>();  // type is mismatched, msgpack::type_error is thrown
-    }
-
-API document and other example codes are available at the [wiki.](http://msgpack.sourceforge.net/start)
-
-
-## License
-
-Copyright (C) 2008-2010 FURUHASHI Sadayuki
-
-   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.
-
-See also NOTICE file.
-

cpp/configure.in

@@ -1,43 +0,0 @@
-AC_INIT(object.cpp)
-AC_CONFIG_AUX_DIR(ac)
-AM_INIT_AUTOMAKE(msgpack, 0.5.0)
-AC_CONFIG_HEADER(config.h)
-
-AC_SUBST(CFLAGS)
-CFLAGS="-O4 -Wall $CFLAGS"
-
-AC_SUBST(CXXFLAGS)
-CXXFLAGS="-O4 -Wall $CXXFLAGS"
-
-AC_PROG_CC
-AC_PROG_CXX
-
-AC_PROG_LIBTOOL
-AM_PROG_AS
-AM_PROG_CC_C_O
-
-AC_LANG_PUSH([C++])
-AC_CHECK_HEADERS(tr1/unordered_map)
-AC_CHECK_HEADERS(tr1/unordered_set)
-AC_LANG_POP([C++])
-
-AC_CACHE_CHECK([for __sync_* atomic operations], msgpack_cv_atomic_ops, [
-	AC_TRY_LINK([
-		int atomic_sub(int i) { return __sync_sub_and_fetch(&i, 1); }
-		int atomic_add(int i) { return __sync_add_and_fetch(&i, 1); }
-	], [], msgpack_cv_atomic_ops="yes")
-	])
-if test "$msgpack_cv_atomic_ops" != "yes"; then
-	AC_MSG_ERROR([__sync_* atomic operations are not supported.
-
-Note that gcc < 4.1 is not supported.
-
-If you are using gcc >= 4.1 and the default target CPU architecture is "i386", try to
-add CFLAGS="--march=i686" and CXXFLAGS="-march=i686" options to ./configure as follows:
-
-  $ ./configure CFLAGS="-march=i686" CXXFLAGS="-march=i686"
-])
-fi
-
-AC_OUTPUT([Makefile test/Makefile])
-

cpp/msgpack/type.hpp

@@ -1,15 +0,0 @@
-#include "msgpack/type/bool.hpp"
-#include "msgpack/type/float.hpp"
-#include "msgpack/type/int.hpp"
-#include "msgpack/type/list.hpp"
-#include "msgpack/type/deque.hpp"
-#include "msgpack/type/map.hpp"
-#include "msgpack/type/nil.hpp"
-#include "msgpack/type/pair.hpp"
-#include "msgpack/type/raw.hpp"
-#include "msgpack/type/set.hpp"
-#include "msgpack/type/string.hpp"
-#include "msgpack/type/vector.hpp"
-#include "msgpack/type/tuple.hpp"
-#include "msgpack/type/define.hpp"
-

cpp/msgpack/unpack.h

@@ -1,123 +0,0 @@
-/*
- * MessagePack for C unpacking routine
- *
- * Copyright (C) 2008-2009 FURUHASHI Sadayuki
- *
- *    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.
- */
-#ifndef MSGPACK_UNPACKER_H__
-#define MSGPACK_UNPACKER_H__
-
-#include "msgpack/zone.h"
-#include "msgpack/object.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-typedef struct msgpack_unpacker {
-	char* buffer;
-	size_t used;
-	size_t free;
-	size_t off;
-	size_t parsed;
-	msgpack_zone* z;
-	size_t initial_buffer_size;
-	void* ctx;
-} msgpack_unpacker;
-
-
-bool msgpack_unpacker_init(msgpack_unpacker* mpac, size_t initial_buffer_size);
-void msgpack_unpacker_destroy(msgpack_unpacker* mpac);
-
-msgpack_unpacker* msgpack_unpacker_new(size_t initial_buffer_size);
-void msgpack_unpacker_free(msgpack_unpacker* mpac);
-
-static inline bool   msgpack_unpacker_reserve_buffer(msgpack_unpacker* mpac, size_t size);
-static inline char*  msgpack_unpacker_buffer(msgpack_unpacker* mpac);
-static inline size_t msgpack_unpacker_buffer_capacity(const msgpack_unpacker* mpac);
-static inline void   msgpack_unpacker_buffer_consumed(msgpack_unpacker* mpac, size_t size);
-
-
-int msgpack_unpacker_execute(msgpack_unpacker* mpac);
-
-msgpack_object msgpack_unpacker_data(msgpack_unpacker* mpac);
-
-msgpack_zone* msgpack_unpacker_release_zone(msgpack_unpacker* mpac);
-
-void msgpack_unpacker_reset_zone(msgpack_unpacker* mpac);
-
-void msgpack_unpacker_reset(msgpack_unpacker* mpac);
-
-static inline size_t msgpack_unpacker_message_size(const msgpack_unpacker* mpac);
-
-
-
-typedef enum {
-	MSGPACK_UNPACK_SUCCESS				=  2,
-	MSGPACK_UNPACK_EXTRA_BYTES			=  1,
-	MSGPACK_UNPACK_CONTINUE				=  0,
-	MSGPACK_UNPACK_PARSE_ERROR			= -1,
-} msgpack_unpack_return;
-
-msgpack_unpack_return
-msgpack_unpack(const char* data, size_t len, size_t* off,
-		msgpack_zone* z, msgpack_object* result);
-
-
-static inline size_t msgpack_unpacker_parsed_size(const msgpack_unpacker* mpac);
-
-bool msgpack_unpacker_flush_zone(msgpack_unpacker* mpac);
-
-bool msgpack_unpacker_expand_buffer(msgpack_unpacker* mpac, size_t size);
-
-bool msgpack_unpacker_reserve_buffer(msgpack_unpacker* mpac, size_t size)
-{
-	if(mpac->free >= size) { return true; }
-	return msgpack_unpacker_expand_buffer(mpac, size);
-}
-
-char* msgpack_unpacker_buffer(msgpack_unpacker* mpac)
-{
-	return mpac->buffer + mpac->used;
-}
-
-size_t msgpack_unpacker_buffer_capacity(const msgpack_unpacker* mpac)
-{
-	return mpac->free;
-}
-
-void msgpack_unpacker_buffer_consumed(msgpack_unpacker* mpac, size_t size)
-{
-	mpac->used += size;
-	mpac->free -= size;
-}
-
-size_t msgpack_unpacker_message_size(const msgpack_unpacker* mpac)
-{
-	return mpac->parsed - mpac->off + mpac->used;
-}
-
-size_t msgpack_unpacker_parsed_size(const msgpack_unpacker* mpac)
-{
-	return mpac->parsed;
-}
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* msgpack/unpack.h */
-

cpp/msgpack_vc8.postbuild.bat

@@ -1,43 +0,0 @@
-IF NOT EXIST include                  MKDIR include
-IF NOT EXIST include\msgpack          MKDIR include\msgpack
-IF NOT EXIST include\msgpack\type     MKDIR include\msgpack\type
-IF NOT EXIST include\msgpack\type\tr1 MKDIR include\msgpack\type\tr1
-copy msgpack\pack_define.h      include\msgpack\
-copy msgpack\pack_template.h    include\msgpack\
-copy msgpack\unpack_define.h    include\msgpack\
-copy msgpack\unpack_template.h  include\msgpack\
-copy msgpack\sysdep.h           include\msgpack\
-copy msgpack.h                     include\
-copy msgpack\sbuffer.h             include\msgpack\
-copy msgpack\vrefbuffer.h          include\msgpack\
-copy msgpack\zbuffer.h             include\msgpack\
-copy msgpack\pack.h                include\msgpack\
-copy msgpack\unpack.h              include\msgpack\
-copy msgpack\object.h              include\msgpack\
-copy msgpack\zone.h                include\msgpack\
-copy msgpack.hpp                   include\
-copy msgpack\sbuffer.hpp           include\msgpack\
-copy msgpack\vrefbuffer.hpp        include\msgpack\
-copy msgpack\zbuffer.hpp           include\msgpack\
-copy msgpack\pack.hpp              include\msgpack\
-copy msgpack\unpack.hpp            include\msgpack\
-copy msgpack\object.hpp            include\msgpack\
-copy msgpack\zone.hpp              include\msgpack\
-copy msgpack\type.hpp              include\msgpack\type\
-copy msgpack\type\bool.hpp         include\msgpack\type\
-copy msgpack\type\float.hpp        include\msgpack\type\
-copy msgpack\type\int.hpp          include\msgpack\type\
-copy msgpack\type\list.hpp         include\msgpack\type\
-copy msgpack\type\deque.hpp        include\msgpack\type\
-copy msgpack\type\map.hpp          include\msgpack\type\
-copy msgpack\type\nil.hpp          include\msgpack\type\
-copy msgpack\type\pair.hpp         include\msgpack\type\
-copy msgpack\type\raw.hpp          include\msgpack\type\
-copy msgpack\type\set.hpp          include\msgpack\type\
-copy msgpack\type\string.hpp       include\msgpack\type\
-copy msgpack\type\vector.hpp       include\msgpack\type\
-copy msgpack\type\tuple.hpp        include\msgpack\type\
-copy msgpack\type\define.hpp       include\msgpack\type\
-copy msgpack\type\tr1\unordered_map.hpp  include\msgpack\type\
-copy msgpack\type\tr1\unordered_set.hpp  include\msgpack\type\
-

cpp/preprocess

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-preprocess() {
-	ruby -r erb -e 'puts ERB.new(ARGF.read).result' $1.erb > $1.tmp
-	if [ "$?" != 0 ]; then
-		echo ""
-		echo "** preprocess failed **"
-		echo ""
-	else
-		mv $1.tmp $1
-	fi
-}
-
-preprocess msgpack/type/tuple.hpp
-preprocess msgpack/type/define.hpp
-preprocess msgpack/zone.hpp
-cp -f ../msgpack/sysdep.h          msgpack/
-cp -f ../msgpack/pack_define.h     msgpack/
-cp -f ../msgpack/pack_template.h   msgpack/
-cp -f ../msgpack/unpack_define.h   msgpack/
-cp -f ../msgpack/unpack_template.h msgpack/
-

cpp/test.mk

@@ -1,9 +0,0 @@
-
-CXXFLAGS  += -Wall -g -I. -I.. -O4
-LDFLAGS +=
-
-all: test
-
-test: test.o unpack.o zone.o object.o pack.hpp unpack.hpp zone.hpp object.hpp
-	$(CXX) test.o unpack.o zone.o object.o $(CXXFLAGS) $(LDFLAGS) -o $@
-

cpp/test/Makefile.am

@@ -1,28 +0,0 @@
-
-AM_CPPFLAGS   = -I..
-AM_C_CPPFLAGS = -I..
-AM_LDFLAGS = ../libmsgpack.la -lgtest_main
-
-check_PROGRAMS = \
-		zone \
-		pack_unpack \
-		streaming \
-		object \
-		convert \
-		buffer
-
-TESTS = $(check_PROGRAMS)
-
-zone_SOURCES = zone.cc
-
-pack_unpack_SOURCES = pack_unpack.cc
-
-streaming_SOURCES = streaming.cc
-
-object_SOURCES = object.cc
-
-convert_SOURCES = convert.cc
-
-buffer_SOURCES = buffer.cc
-buffer_LDADD = -lz
-

cpp/test/buffer.cc

@@ -1,50 +0,0 @@
-#include <msgpack.hpp>
-#include <msgpack/zbuffer.hpp>
-#include <gtest/gtest.h>
-#include <string.h>
-
-TEST(buffer, sbuffer)
-{
-	msgpack::sbuffer sbuf;
-	sbuf.write("a", 1);
-	sbuf.write("a", 1);
-	sbuf.write("a", 1);
-
-	EXPECT_EQ(3, sbuf.size());
-	EXPECT_TRUE( memcmp(sbuf.data(), "aaa", 3) == 0 );
-}
-
-
-TEST(buffer, vrefbuffer)
-{
-	msgpack::vrefbuffer vbuf;
-	vbuf.write("a", 1);
-	vbuf.write("a", 1);
-	vbuf.write("a", 1);
-
-	const struct iovec* vec = vbuf.vector();
-	size_t veclen = vbuf.vector_size();
-
-	msgpack::sbuffer sbuf;
-	for(size_t i=0; i < veclen; ++i) {
-		sbuf.write((const char*)vec[i].iov_base, vec[i].iov_len);
-	}
-
-	EXPECT_EQ(3, sbuf.size());
-	EXPECT_TRUE( memcmp(sbuf.data(), "aaa", 3) == 0 );
-}
-
-
-TEST(buffer, zbuffer)
-{
-	msgpack::zbuffer zbuf;
-	zbuf.write("a", 1);
-	zbuf.write("a", 1);
-	zbuf.write("a", 1);
-
-	zbuf.flush();
-
-	char* data = zbuf.data();
-	size_t size = zbuf.size();
-}
-

crosslang.cc

@@ -0,0 +1,133 @@
+//
+// MessagePack cross-language test tool
+//
+// $ cd ../cpp && ./configure && make && make install
+// or
+// $ port install msgpack  # MacPorts
+//
+// $ g++ -Wall crosslang.cc -lmsgpack
+//
+#include <msgpack.hpp>
+#include <iostream>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+static int run(int infd, int outfd)
+try {
+	msgpack::unpacker pac;
+
+	while(true) {
+		pac.reserve_buffer(32*1024);
+
+		ssize_t count =
+			read(infd, pac.buffer(), pac.buffer_capacity());
+
+		if(count <= 0) {
+			if(count == 0) {
+				return 0;
+			}
+			if(errno == EAGAIN || errno == EINTR) {
+				continue;
+			}
+			return 1;
+		}
+
+		pac.buffer_consumed(count);
+
+		msgpack::unpacked result;
+		while(pac.next(&result)) {
+			msgpack::sbuffer sbuf;
+			msgpack::pack(sbuf, result.get());
+
+			const char* p = sbuf.data();
+			const char* const pend = p + sbuf.size();
+			while(p < pend) {
+				ssize_t bytes = write(outfd, p, pend-p);
+
+				if(bytes <= 0) {
+					if(count == 0) {
+						return 0;
+					}
+					if(errno == EAGAIN || errno == EINTR) {
+						continue;
+					}
+					return 1;
+				}
+
+				p += bytes;
+			}
+
+		}
+	}
+
+	return 0;
+
+} catch (std::exception& e) {
+	std::cerr << e.what() << std::endl;
+	return 1;
+}
+
+static void usage(const char* prog)
+{
+	printf(
+		"Usage: %s [in-file] [out-file]\n"
+		"\n"
+		"This tool is for testing of MessagePack implementation.\n"
+		"This does following behavior:\n"
+		"\n"
+		"  1. Reads objects serialized by MessagePack from <in-file> (default: stdin)\n"
+		"  2. Re-serializes the objects using C++ implementation of MessagePack (Note that C++ implementation is considered valid)\n"
+		"  3. Writes the re-serialized objects into <out-file> (default: stdout)\n"
+		"\n"
+		, prog);
+	exit(1);
+}
+
+int main(int argc, char* argv[])
+{
+	int infd = 0;
+	int outfd = 1;
+
+	if(argc < 1 || argc > 3) {
+		usage(argv[0]);
+	}
+
+	for(int i=1; i < argc; ++i) {
+		if(strlen(argv[i]) > 1 && argv[i][0] == '-') {
+			usage(argv[0]);
+		}
+	}
+
+	if(argc >= 2) {
+		const char* fname = argv[1];
+		if(strcmp(fname, "-") != 0) {
+			infd = open(fname, O_RDONLY);
+			if(infd < 0) {
+				perror("can't open input file");
+				exit(1);
+			}
+		}
+	}
+
+	if(argc >= 3) {
+		const char* fname = argv[2];
+		if(strcmp(fname, "-") != 0) {
+			outfd = open(fname, O_WRONLY | O_CREAT| O_TRUNC, 0666);
+			if(outfd < 0) {
+				perror("can't open output file");
+				exit(1);
+			}
+		}
+	}
+
+	int code = run(infd, outfd);
+
+	close(infd);
+	close(outfd);
+
+	return code;
+}
+

crosslang.rb

@@ -0,0 +1,88 @@
+#
+# MessagePack cross-language test tool
+#
+# $ gem install msgpack
+# or
+# $ port install rb_msgpack   # MacPorts
+#
+begin
+require 'rubygems'
+rescue LoadError
+end
+require 'msgpack'
+
+def run(inio, outio)
+	pac = MessagePack::Unpacker.new(inio)
+
+	begin
+		pac.each {|obj|
+			outio.write MessagePack.pack(obj)
+			outio.flush
+		}
+	rescue EOFError
+		return 0
+	rescue
+		$stderr.puts $!
+		return 1
+	end
+
+	return 0
+end
+
+def usage
+	puts <<EOF
+Usage: #{$0} [in-file] [out-file]
+
+This tool is for testing of MessagePack implementation.
+This does following behavior:
+
+  1. Reads objects serialized by MessagePack from <in-file> (default: stdin)
+  2. Re-serializes the objects using Ruby implementation of MessagePack (Note that Ruby implementation is considered valid)
+  3. Writes the re-serialized objects into <out-file> (default: stdout)
+
+EOF
+	exit 1
+end
+
+inio = $stdin
+outio = $stdout
+
+if ARGV.length > 2
+	usage
+end
+
+ARGV.each {|str|
+	if str.size > 1 && str[0] == ?-
+		usage
+	end
+}
+
+if fname = ARGV[0]
+	unless fname == "-"
+		begin
+			inio = File.open(fname)
+		rescue
+			puts "can't open output file: #{$!}"
+			exit 1
+		end
+	end
+end
+
+if fname = ARGV[1]
+	unless fname == "-"
+		begin
+			outio = File.open(fname, "w")
+		rescue
+			puts "can't open output file: #{$!}"
+			exit 1
+		end
+	end
+end
+
+code = run(inio, outio)
+
+inio.close
+outio.close
+
+exit code
+

example/protocol.cc

@@ -17,7 +17,7 @@ namespace myprotocol {
 
 	struct Put : define< tuple<uint32_t, std::string, raw_ref> > {
 		Put() { }
-		Put(uint32_t f, const std::string& k, const char* valref, size_t vallen) :
+		Put(uint32_t f, const std::string& k, const char* valref, uint32_t vallen) :
 			define_type(msgpack_type( f, k, raw_ref(valref,vallen) )) { }
 		uint32_t&    flags() { return get<0>(); }
 		std::string& key()   { return get<1>(); }

example/simple.rb

@@ -1,5 +0,0 @@
-require 'msgpack'
-
-serialized = [1, -1, true, false, nil, {"key" => "value"}].to_msgpack
-p MessagePack.unpack(serialized)
-

example/speed_test_uint32_array.c

@@ -0,0 +1,36 @@
+#include <msgpack.h>
+#include <assert.h>
+
+void test()
+{
+	size_t size = 10000000;
+	msgpack_sbuffer buf;
+	msgpack_sbuffer_init(&buf);
+
+	msgpack_packer * pk = msgpack_packer_new(&buf, msgpack_sbuffer_write);
+
+	msgpack_pack_array(pk, size);
+	{
+		int idx = 0;
+		for (; idx < size; ++idx)
+			msgpack_pack_uint32(pk, 1);
+	}
+	msgpack_packer_free(pk);
+
+
+	size_t upk_pos = 0;
+	msgpack_unpacked msg;
+	msgpack_unpacked_init(&msg);
+
+	while (msgpack_unpack_next(&msg, buf.data, buf.size, &upk_pos)) {
+	}
+
+	msgpack_sbuffer_destroy(&buf);
+}
+
+int main(int argc, char **argv)
+{
+	int i = 0;
+	for (; i < 10; ++i) test();
+	return 0;
+}

example/speed_test_uint64_array.c

@@ -0,0 +1,37 @@
+#include <msgpack.h>
+#include <assert.h>
+
+void test()
+{
+	uint64_t test_u64 = 0xFFF0000000000001LL;
+	size_t size = 10000000;
+	msgpack_sbuffer buf;
+	msgpack_sbuffer_init(&buf);
+
+	msgpack_packer * pk = msgpack_packer_new(&buf, msgpack_sbuffer_write);
+
+	msgpack_pack_array(pk, size);
+	{
+		int idx = 0;
+		for (; idx < size; ++idx)
+			msgpack_pack_uint64(pk, test_u64);
+	}
+	msgpack_packer_free(pk);
+
+
+	size_t upk_pos = 0;
+	msgpack_unpacked msg;
+	msgpack_unpacked_init(&msg);
+
+	while (msgpack_unpack_next(&msg, buf.data, buf.size, &upk_pos)) {
+	}
+
+	msgpack_sbuffer_destroy(&buf);
+}
+
+int main(int argc, char **argv)
+{
+	int i = 0;
+	for (; i < 10; ++i) test();
+	return 0;
+}

example/stream.cc

@@ -34,13 +34,10 @@ public:
 
 		m_pac.buffer_consumed(count);
 
-		while(m_pac.execute()) {
-			msgpack::object msg = m_pac.data();
-
-			auto_zone life( m_pac.release_zone() );
-
-			m_pac.reset();
-
+		msgpack::unpacked result;
+		while (m_pac.next(&result)) {
+			msgpack::object msg = result.get();
+			auto_zone& life = result.zone();
 			process_message(msg, life);
 		}
 

example/stream.rb

@@ -1,72 +0,0 @@
-require 'msgpack'
-
-class Server
-	def initialize(sock)
-		@sock = sock
-		@pk = MessagePack::Unpacker.new
-		@buffer = ''
-		@nread = 0
-	end
-
-	def run
-		while true
-			begin
-				data = @sock.sysread(1024)
-			rescue
-				puts "connection closed (#{$!})"
-				return
-			end
-			receive_data(data)
-		end
-	end
-
-	private
-	def receive_data(data)
-		@buffer << data
-
-		while true
-			@nread = @pk.execute(@buffer, @nread)
-
-			if @pk.finished?
-				msg = @pk.data
-				process_message(msg)
-
-				@pk.reset
-				@buffer.slice!(0, @nread)
-				@nread = 0
-
-				next unless @buffer.empty?
-			end
-
-			break
-		end
-
-		if @buffer.length > 10*1024*1024
-			raise "message is too large"
-		end
-
-	rescue
-		puts "error while processing client packet: #{$!}"
-	end
-
-	def process_message(msg)
-		puts "message reached: #{msg.inspect}"
-	end
-end
-
-
-rpipe, wpipe = IO.pipe
-
-# run server thread
-thread = Thread.new(Server.new(rpipe)) {|srv|
-	srv.run
-}
-
-# client thread:
-wpipe.write ["put", "apple", "red"].to_msgpack
-wpipe.write ["put", "lemon", "yellow"].to_msgpack
-wpipe.write ["get", "apple"].to_msgpack
-wpipe.close
-
-thread.join
-

haskell/LICENSE

@@ -1,24 +0,0 @@
-Copyright (c) 2009, Hideyuki Tanaka
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Hideyuki Tanaka nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY Hideyuki Tanaka ''AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

haskell/Setup.lhs

@@ -1,3 +0,0 @@
-#!/usr/bin/env runhaskell
-> import Distribution.Simple
-> main = defaultMain

haskell/cbits/msgpack.c

@@ -1,137 +0,0 @@
-#include <msgpack.h>
-
-void msgpack_sbuffer_init_wrap(msgpack_sbuffer* sbuf)
-{
-  msgpack_sbuffer_init(sbuf);
-}
-
-void msgpack_sbuffer_destroy_wrap(msgpack_sbuffer* sbuf)
-{
-  msgpack_sbuffer_destroy(sbuf);
-}
-
-int msgpack_sbuffer_write_wrap(void* data, const char* buf, unsigned int len)
-{
-  return msgpack_sbuffer_write(data, buf, len);
-}
-
-msgpack_packer* msgpack_packer_new_wrap(void *data, msgpack_packer_write callback)
-{
-  return msgpack_packer_new(data, callback);
-}
-
-void msgpack_packer_free_wrap(msgpack_packer* pk)
-{
-  msgpack_packer_free(pk);
-}
-
-int msgpack_pack_uint8_wrap(msgpack_packer* pk, uint8_t d)
-{
-  return msgpack_pack_uint8(pk, d);
-}
-
-int msgpack_pack_uint16_wrap(msgpack_packer* pk, uint16_t d)
-{
-  return msgpack_pack_uint16(pk, d);
-}
-
-int msgpack_pack_uint32_wrap(msgpack_packer* pk, uint32_t d)
-{
-  return msgpack_pack_uint32(pk, d);
-}
-
-int msgpack_pack_uint64_wrap(msgpack_packer* pk, uint64_t d)
-{
-  return msgpack_pack_uint64(pk, d);
-}
-
-int msgpack_pack_int8_wrap(msgpack_packer* pk, int8_t d)
-{
-  return msgpack_pack_int8(pk, d);
-}
-
-int msgpack_pack_int16_wrap(msgpack_packer* pk, int16_t d)
-{
-  return msgpack_pack_int16(pk, d);
-}
-
-int msgpack_pack_int32_wrap(msgpack_packer* pk, int32_t d)
-{
-  return msgpack_pack_int32(pk, d);
-}
-
-int msgpack_pack_int64_wrap(msgpack_packer* pk, int64_t d)
-{
-  return msgpack_pack_int64(pk, d);
-}
-
-int msgpack_pack_double_wrap(msgpack_packer* pk, double d)
-{
-  return msgpack_pack_double(pk, d);
-}
-
-int msgpack_pack_nil_wrap(msgpack_packer* pk)
-{
-  return msgpack_pack_nil(pk);
-}
-
-int msgpack_pack_true_wrap(msgpack_packer* pk)
-{
-  return msgpack_pack_true(pk);
-}
-
-int msgpack_pack_false_wrap(msgpack_packer* pk)
-{
-  return msgpack_pack_false(pk);
-}
-
-int msgpack_pack_array_wrap(msgpack_packer* pk, unsigned int n)
-{
-  return msgpack_pack_array(pk, n);
-}
-
-int msgpack_pack_map_wrap(msgpack_packer* pk, unsigned int n)
-{
-  return msgpack_pack_map(pk, n);
-}
-
-int msgpack_pack_raw_wrap(msgpack_packer* pk, size_t l)
-{
-  return msgpack_pack_raw(pk, l);
-}
-
-int msgpack_pack_raw_body_wrap(msgpack_packer* pk, const void *b, size_t l)
-{
-  return msgpack_pack_raw_body(pk, b, l);
-}
-
-bool msgpack_unpacker_reserve_buffer_wrap(msgpack_unpacker *mpac, size_t size)
-{
-  return msgpack_unpacker_reserve_buffer(mpac, size);
-}
-
-char *msgpack_unpacker_buffer_wrap(msgpack_unpacker *mpac)
-{
-  return msgpack_unpacker_buffer(mpac);
-}
-
-size_t msgpack_unpacker_buffer_capacity_wrap(const msgpack_unpacker *mpac)
-{
-  return msgpack_unpacker_buffer_capacity(mpac);
-}
-
-void msgpack_unpacker_buffer_consumed_wrap(msgpack_unpacker *mpac, size_t size)
-{
-  msgpack_unpacker_buffer_consumed(mpac, size);
-}
-
-void msgpack_unpacker_data_wrap(msgpack_unpacker *mpac, msgpack_object *obj)
-{
-  *obj=msgpack_unpacker_data(mpac);
-}
-
-size_t msgpack_unpacker_message_size_wrap(const msgpack_unpacker *mpac)
-{
-  return msgpack_unpacker_message_size(mpac);
-}
-

haskell/msgpack.cabal

@@ -1,32 +0,0 @@
-Name:                msgpack
-Version:             0.2.0
-License:             BSD3
-License-File:        LICENSE
-Author:              Hideyuki Tanaka
-Maintainer:          Hideyuki Tanaka <tanaka.hideyuki@gmail.com>
-Category:            Data
-Synopsis:            A Haskell binding to MessagePack
-Description:
-  A Haskell binding to MessagePack <http://msgpack.sourceforge.jp/>
-Homepage:	     http://github.com/tanakh/hsmsgpack
-Stability:	     Experimental
-Tested-with:	     GHC==6.10.4
-Cabal-Version:	     >=1.2
-Build-Type:          Simple
-
-library
-  build-depends:	base>=4 && <5, mtl, bytestring
-  ghc-options:		-O2 -Wall
-  hs-source-dirs:	src
-  extra-libraries:	msgpackc
-
-  Exposed-modules:
-    Data.MessagePack
-    Data.MessagePack.Base
-    Data.MessagePack.Class
-    Data.MessagePack.Feed
-    Data.MessagePack.Monad
-    Data.MessagePack.Stream
-
-  C-Sources:
-    cbits/msgpack.c

haskell/src/Data/MessagePack.hs

@@ -1,63 +0,0 @@
---------------------------------------------------------------------
--- |
--- Module    : Data.MessagePack
--- Copyright : (c) Hideyuki Tanaka, 2009
--- License   : BSD3
---
--- Maintainer:  tanaka.hideyuki@gmail.com
--- Stability :  experimental
--- Portability: portable
---
--- Simple interface to pack and unpack MessagePack data.
---
---------------------------------------------------------------------
-
-module Data.MessagePack(
-  module Data.MessagePack.Base,
-  module Data.MessagePack.Class,
-  module Data.MessagePack.Feed,
-  module Data.MessagePack.Monad,
-  module Data.MessagePack.Stream,
-  
-  -- * Pack and Unpack
-  packb,
-  unpackb,
-  
-  -- * Pure version of Pack and Unpack
-  packb',
-  unpackb',
-  ) where
-
-import Data.ByteString (ByteString)
-import System.IO.Unsafe
-
-import Data.MessagePack.Base
-import Data.MessagePack.Class
-import Data.MessagePack.Feed
-import Data.MessagePack.Monad
-import Data.MessagePack.Stream
-
--- | Pack Haskell data to MessagePack string.
-packb :: OBJECT a => a -> IO ByteString
-packb dat = do
-  sb <- newSimpleBuffer
-  pc <- newPacker sb
-  pack pc dat
-  simpleBufferData sb
-
--- | Unpack MessagePack string to Haskell data.
-unpackb :: OBJECT a => ByteString -> IO (Result a)
-unpackb bs = do
-  withZone $ \z -> do
-    r <- unpackObject z bs
-    return $ case r of
-      Left err -> Left (show err)
-      Right (_, dat) -> fromObject dat
-
--- | Pure version of 'packb'.
-packb' :: OBJECT a => a -> ByteString
-packb' dat = unsafePerformIO $ packb dat
-
--- | Pure version of 'unpackb'.
-unpackb' :: OBJECT a => ByteString -> Result a
-unpackb' bs = unsafePerformIO $ unpackb bs

haskell/src/Data/MessagePack/Base.hsc

@@ -1,581 +0,0 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE ForeignFunctionInterface #-}
-
---------------------------------------------------------------------
--- |
--- Module    : Data.MessagePack.Base
--- Copyright : (c) Hideyuki Tanaka, 2009
--- License   : BSD3
---
--- Maintainer:  tanaka.hideyuki@gmail.com
--- Stability :  experimental
--- Portability: portable
---
--- Low Level Interface to MessagePack C API
---
---------------------------------------------------------------------
-
-module Data.MessagePack.Base(
-  -- * Simple Buffer
-  SimpleBuffer,
-  newSimpleBuffer,
-  simpleBufferData,
-  
-  -- * Serializer
-  Packer,
-  newPacker,
-  
-  packU8,
-  packU16,
-  packU32,
-  packU64,  
-  packS8,
-  packS16,
-  packS32,
-  packS64,
-  
-  packTrue,
-  packFalse,
-  
-  packInt,
-  packDouble,
-  packNil,
-  packBool,
-  
-  packArray,
-  packMap,
-  packRAW,
-  packRAWBody,
-  packRAW',
-  
-  -- * Stream Deserializer
-  Unpacker,
-  defaultInitialBufferSize,
-  newUnpacker,
-  unpackerReserveBuffer,
-  unpackerBuffer,
-  unpackerBufferCapacity,
-  unpackerBufferConsumed,
-  unpackerFeed,
-  unpackerExecute,
-  unpackerData,
-  unpackerReleaseZone,
-  unpackerResetZone,
-  unpackerReset,
-  unpackerMessageSize,
-  
-  -- * MessagePack Object
-  Object(..),
-  packObject,
-  
-  UnpackReturn(..),
-  unpackObject,
-  
-  -- * Memory Zone
-  Zone,
-  newZone,
-  freeZone,
-  withZone,
-  ) where
-
-import Control.Exception
-import Control.Monad
-import Data.ByteString (ByteString)
-import qualified Data.ByteString as BS hiding (pack, unpack)
-import Data.Int
-import Data.Word
-import Foreign.C
-import Foreign.Concurrent
-import Foreign.ForeignPtr hiding (newForeignPtr)
-import Foreign.Marshal.Alloc
-import Foreign.Marshal.Array
-import Foreign.Ptr
-import Foreign.Storable
-
-#include <msgpack.h>
-
-type SimpleBuffer = ForeignPtr ()
-
-type WriteCallback = Ptr () -> CString -> CUInt -> IO CInt
-
--- | Create a new Simple Buffer. It will be deleted automatically.
-newSimpleBuffer :: IO SimpleBuffer
-newSimpleBuffer = do
-  ptr <- mallocBytes (#size msgpack_sbuffer)
-  fptr <- newForeignPtr ptr $ do
-    msgpack_sbuffer_destroy ptr
-    free ptr
-  withForeignPtr fptr $ \p ->
-    msgpack_sbuffer_init p
-  return fptr
-
--- | Get data of Simple Buffer.
-simpleBufferData :: SimpleBuffer -> IO ByteString
-simpleBufferData sb =
-  withForeignPtr sb $ \ptr -> do
-    size <- (#peek msgpack_sbuffer, size) ptr
-    dat  <- (#peek msgpack_sbuffer, data) ptr
-    BS.packCStringLen (dat, fromIntegral (size :: CSize))
-
-foreign import ccall "msgpack_sbuffer_init_wrap" msgpack_sbuffer_init ::
-  Ptr () -> IO ()
-
-foreign import ccall "msgpack_sbuffer_destroy_wrap" msgpack_sbuffer_destroy ::
-  Ptr () -> IO ()
-
-foreign import ccall "msgpack_sbuffer_write_wrap" msgpack_sbuffer_write ::
-  WriteCallback
-
-type Packer = ForeignPtr ()
-
--- | Create new Packer. It will be deleted automatically.
-newPacker :: SimpleBuffer -> IO Packer
-newPacker sbuf = do
-  cb <- wrap_callback msgpack_sbuffer_write
-  ptr <- withForeignPtr sbuf $ \ptr ->
-    msgpack_packer_new ptr cb
-  fptr <- newForeignPtr ptr $ do
-    msgpack_packer_free ptr
-  return fptr
-
-foreign import ccall "msgpack_packer_new_wrap" msgpack_packer_new ::
-  Ptr () -> FunPtr WriteCallback -> IO (Ptr ())
-
-foreign import ccall "msgpack_packer_free_wrap" msgpack_packer_free ::
-  Ptr () -> IO ()
-
-foreign import ccall "wrapper" wrap_callback ::
-  WriteCallback -> IO (FunPtr WriteCallback)
-
-packU8 :: Packer -> Word8 -> IO Int
-packU8 pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_uint8 ptr n
-
-foreign import ccall "msgpack_pack_uint8_wrap" msgpack_pack_uint8 ::
-  Ptr () -> Word8 -> IO CInt
-
-packU16 :: Packer -> Word16 -> IO Int
-packU16 pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_uint16 ptr n
-
-foreign import ccall "msgpack_pack_uint16_wrap" msgpack_pack_uint16 ::
-  Ptr () -> Word16 -> IO CInt
-
-packU32 :: Packer -> Word32 -> IO Int
-packU32 pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_uint32 ptr n
-
-foreign import ccall "msgpack_pack_uint32_wrap" msgpack_pack_uint32 ::
-  Ptr () -> Word32 -> IO CInt
-
-packU64 :: Packer -> Word64 -> IO Int
-packU64 pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_uint64 ptr n
-
-foreign import ccall "msgpack_pack_uint64_wrap" msgpack_pack_uint64 ::
-  Ptr () -> Word64 -> IO CInt
-
-packS8 :: Packer -> Int8 -> IO Int
-packS8 pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_int8 ptr n
-
-foreign import ccall "msgpack_pack_int8_wrap" msgpack_pack_int8 ::
-  Ptr () -> Int8 -> IO CInt
-
-packS16 :: Packer -> Int16 -> IO Int
-packS16 pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_int16 ptr n
-
-foreign import ccall "msgpack_pack_int16_wrap" msgpack_pack_int16 ::
-  Ptr () -> Int16 -> IO CInt
-
-packS32 :: Packer -> Int32 -> IO Int
-packS32 pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_int32 ptr n
-
-foreign import ccall "msgpack_pack_int32_wrap" msgpack_pack_int32 ::
-  Ptr () -> Int32 -> IO CInt
-
-packS64 :: Packer -> Int64 -> IO Int
-packS64 pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_int64 ptr n
-
-foreign import ccall "msgpack_pack_int64_wrap" msgpack_pack_int64 ::
-  Ptr () -> Int64 -> IO CInt
-
--- | Pack an integral data.
-packInt :: Integral a => Packer -> a -> IO Int
-packInt pc n = packS64 pc $ fromIntegral n
-
--- | Pack a double data.
-packDouble :: Packer -> Double -> IO Int
-packDouble pc d =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_double ptr (realToFrac d)
-
-foreign import ccall "msgpack_pack_double_wrap" msgpack_pack_double ::
-  Ptr () -> CDouble -> IO CInt
-
--- | Pack a nil.
-packNil :: Packer -> IO Int
-packNil pc =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_nil ptr
-
-foreign import ccall "msgpack_pack_nil_wrap" msgpack_pack_nil ::
-  Ptr () -> IO CInt
-
-packTrue :: Packer -> IO Int
-packTrue pc =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_true ptr
-
-foreign import ccall "msgpack_pack_true_wrap" msgpack_pack_true ::
-  Ptr () -> IO CInt
-
-packFalse :: Packer -> IO Int
-packFalse pc =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_false ptr
-
-foreign import ccall "msgpack_pack_false_wrap" msgpack_pack_false ::
-  Ptr () -> IO CInt
-
--- | Pack a bool data.
-packBool :: Packer -> Bool -> IO Int
-packBool pc True  = packTrue pc
-packBool pc False = packFalse pc
-
--- | 'packArray' @p n@ starts packing an array. 
--- Next @n@ data will consist this array.
-packArray :: Packer -> Int -> IO Int
-packArray pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_array ptr (fromIntegral n)
-
-foreign import ccall "msgpack_pack_array_wrap" msgpack_pack_array ::
-  Ptr () -> CUInt -> IO CInt
-
--- | 'packMap' @p n@ starts packing a map. 
--- Next @n@ pairs of data (2*n data) will consist this map.
-packMap :: Packer -> Int -> IO Int
-packMap pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_map ptr (fromIntegral n)
-
-foreign import ccall "msgpack_pack_map_wrap" msgpack_pack_map ::
-  Ptr () -> CUInt -> IO CInt
-
--- | 'packRAW' @p n@ starts packing a byte sequence. 
--- Next total @n@ bytes of 'packRAWBody' call will consist this sequence.
-packRAW :: Packer -> Int -> IO Int
-packRAW pc n =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-    msgpack_pack_raw ptr (fromIntegral n)
-
-foreign import ccall "msgpack_pack_raw_wrap" msgpack_pack_raw ::
-  Ptr () -> CSize -> IO CInt
-
--- | Pack a byte sequence.
-packRAWBody :: Packer -> ByteString -> IO Int
-packRAWBody pc bs =
-  liftM fromIntegral $ withForeignPtr pc $ \ptr ->
-  BS.useAsCStringLen bs $ \(str, len) ->
-    msgpack_pack_raw_body ptr (castPtr str) (fromIntegral len)
-
-foreign import ccall "msgpack_pack_raw_body_wrap" msgpack_pack_raw_body ::
-  Ptr () -> Ptr () -> CSize -> IO CInt
-
--- | Pack a single byte stream. It calls 'packRAW' and 'packRAWBody'.
-packRAW' :: Packer -> ByteString -> IO Int
-packRAW' pc bs = do
-  packRAW pc (BS.length bs)
-  packRAWBody pc bs
-
-type Unpacker = ForeignPtr ()
-
-defaultInitialBufferSize :: Int
-defaultInitialBufferSize = 32 * 1024 -- #const MSGPACK_UNPACKER_DEFAULT_INITIAL_BUFFER_SIZE
-
--- | 'newUnpacker' @initialBufferSize@ creates a new Unpacker. It will be deleted automatically.
-newUnpacker :: Int -> IO Unpacker
-newUnpacker initialBufferSize = do
-  ptr <- msgpack_unpacker_new (fromIntegral initialBufferSize)
-  fptr <- newForeignPtr ptr $ do
-    msgpack_unpacker_free ptr
-  return fptr
-
-foreign import ccall "msgpack_unpacker_new" msgpack_unpacker_new ::
-  CSize -> IO (Ptr ())
-
-foreign import ccall "msgpack_unpacker_free" msgpack_unpacker_free ::
-  Ptr() -> IO ()
-
--- | 'unpackerReserveBuffer' @up size@ reserves at least @size@ bytes of buffer.
-unpackerReserveBuffer :: Unpacker -> Int -> IO Bool
-unpackerReserveBuffer up size =
-  withForeignPtr up $ \ptr ->
-  liftM (/=0) $ msgpack_unpacker_reserve_buffer ptr (fromIntegral size)
-
-foreign import ccall "msgpack_unpacker_reserve_buffer_wrap" msgpack_unpacker_reserve_buffer ::
-  Ptr () -> CSize -> IO CChar
-
--- | Get a pointer of unpacker buffer.
-unpackerBuffer :: Unpacker -> IO (Ptr CChar)
-unpackerBuffer up =
-  withForeignPtr up $ \ptr ->
-  msgpack_unpacker_buffer ptr
-
-foreign import ccall "msgpack_unpacker_buffer_wrap" msgpack_unpacker_buffer ::
-  Ptr () -> IO (Ptr CChar)
-
--- | Get size of allocated buffer.
-unpackerBufferCapacity :: Unpacker -> IO Int
-unpackerBufferCapacity up =
-  withForeignPtr up $ \ptr ->
-  liftM fromIntegral $ msgpack_unpacker_buffer_capacity ptr
-
-foreign import ccall "msgpack_unpacker_buffer_capacity_wrap" msgpack_unpacker_buffer_capacity ::
-  Ptr () -> IO CSize
-
--- | 'unpackerBufferConsumed' @up size@ notices that writed @size@ bytes to buffer.
-unpackerBufferConsumed :: Unpacker -> Int -> IO ()
-unpackerBufferConsumed up size =
-  withForeignPtr up $ \ptr ->
-  msgpack_unpacker_buffer_consumed ptr (fromIntegral size)
-
-foreign import ccall "msgpack_unpacker_buffer_consumed_wrap" msgpack_unpacker_buffer_consumed ::
-  Ptr () -> CSize -> IO ()
-
--- | Write byte sequence to Unpacker. It is utility funciton, calls 'unpackerReserveBuffer', 'unpackerBuffer' and 'unpackerBufferConsumed'.
-unpackerFeed :: Unpacker -> ByteString -> IO ()
-unpackerFeed up bs =
-  BS.useAsCStringLen bs $ \(str, len) -> do
-    True <- unpackerReserveBuffer up len
-    ptr <- unpackerBuffer up
-    copyArray ptr str len
-    unpackerBufferConsumed up len
-
--- | Execute deserializing. It returns 0 when buffer contains not enough bytes, returns 1 when succeeded, returns negative value when it failed.
-unpackerExecute :: Unpacker -> IO Int
-unpackerExecute up =
-  withForeignPtr up $ \ptr ->
-  liftM fromIntegral $ msgpack_unpacker_execute ptr
-
-foreign import ccall "msgpack_unpacker_execute" msgpack_unpacker_execute ::
-  Ptr () -> IO CInt
-
--- | Returns a deserialized object when 'unpackerExecute' returned 1.
-unpackerData :: Unpacker -> IO Object
-unpackerData up =
-  withForeignPtr up $ \ptr ->
-  allocaBytes (#size msgpack_object) $ \pobj -> do
-    msgpack_unpacker_data ptr pobj
-    peekObject pobj
-
-foreign import ccall "msgpack_unpacker_data_wrap" msgpack_unpacker_data ::
-  Ptr () -> Ptr () -> IO ()
-
--- | Release memory zone. The returned zone must be freed by calling 'freeZone'.
-unpackerReleaseZone :: Unpacker -> IO Zone
-unpackerReleaseZone up =
-  withForeignPtr up $ \ptr ->
-  msgpack_unpacker_release_zone ptr
-
-foreign import ccall "msgpack_unpacker_release_zone" msgpack_unpacker_release_zone ::
-  Ptr () -> IO (Ptr ())
-
--- | Free memory zone used by Unapcker.
-unpackerResetZone :: Unpacker -> IO ()
-unpackerResetZone up =
-  withForeignPtr up $ \ptr ->
-  msgpack_unpacker_reset_zone ptr
-
-foreign import ccall "msgpack_unpacker_reset_zone" msgpack_unpacker_reset_zone ::
-  Ptr () -> IO ()
-
--- | Reset Unpacker state except memory zone.
-unpackerReset :: Unpacker -> IO ()
-unpackerReset up =
-  withForeignPtr up $ \ptr ->
-  msgpack_unpacker_reset ptr
-
-foreign import ccall "msgpack_unpacker_reset" msgpack_unpacker_reset ::
-  Ptr () -> IO ()
-
--- | Returns number of bytes of sequence of deserializing object.
-unpackerMessageSize :: Unpacker -> IO Int
-unpackerMessageSize up =
-  withForeignPtr up $ \ptr ->
-  liftM fromIntegral $ msgpack_unpacker_message_size ptr
-
-foreign import ccall "msgpack_unpacker_message_size_wrap" msgpack_unpacker_message_size ::
-  Ptr () -> IO CSize
-
-type Zone = Ptr ()
-
--- | Create a new memory zone. It must be freed manually.
-newZone :: IO Zone
-newZone =
-  msgpack_zone_new (#const MSGPACK_ZONE_CHUNK_SIZE)
-
--- | Free a memory zone.
-freeZone :: Zone -> IO ()
-freeZone z =
-  msgpack_zone_free z
-
--- | Create a memory zone, then execute argument, then free memory zone.
-withZone :: (Zone -> IO a) -> IO a
-withZone z =
-  bracket newZone freeZone z
-
-foreign import ccall "msgpack_zone_new" msgpack_zone_new ::
-  CSize -> IO Zone
-
-foreign import ccall "msgpack_zone_free" msgpack_zone_free ::
-  Zone -> IO ()
-
--- | Object Representation of MessagePack data.
-data Object =
-  ObjectNil
-  | ObjectBool Bool
-  | ObjectInteger Int
-  | ObjectDouble Double
-  | ObjectRAW ByteString
-  | ObjectArray [Object]
-  | ObjectMap [(Object, Object)]
-  deriving (Show)
-
-peekObject :: Ptr a -> IO Object
-peekObject ptr = do
-  typ <- (#peek msgpack_object, type) ptr
-  case (typ :: CInt) of
-    (#const MSGPACK_OBJECT_NIL) ->
-      return ObjectNil
-    (#const MSGPACK_OBJECT_BOOLEAN) ->
-      peekObjectBool ptr
-    (#const MSGPACK_OBJECT_POSITIVE_INTEGER) ->
-      peekObjectPositiveInteger ptr
-    (#const MSGPACK_OBJECT_NEGATIVE_INTEGER) ->
-      peekObjectNegativeInteger ptr
-    (#const MSGPACK_OBJECT_DOUBLE) ->
-      peekObjectDouble ptr
-    (#const MSGPACK_OBJECT_RAW) ->
-      peekObjectRAW ptr
-    (#const MSGPACK_OBJECT_ARRAY) ->
-      peekObjectArray ptr
-    (#const MSGPACK_OBJECT_MAP) ->
-      peekObjectMap ptr
-    _ ->
-      fail "peekObject: unknown object type"
-
-peekObjectBool :: Ptr a -> IO Object
-peekObjectBool ptr = do
-  b <- (#peek msgpack_object, via.boolean) ptr
-  return $ ObjectBool $ (b :: CUChar) /= 0
-
-peekObjectPositiveInteger :: Ptr a -> IO Object
-peekObjectPositiveInteger ptr = do
-  n <- (#peek msgpack_object, via.u64) ptr
-  return $ ObjectInteger $ fromIntegral (n :: Word64)
-
-peekObjectNegativeInteger :: Ptr a -> IO Object
-peekObjectNegativeInteger ptr = do
-  n <- (#peek msgpack_object, via.i64) ptr
-  return $ ObjectInteger $ fromIntegral (n :: Int64)
-
-peekObjectDouble :: Ptr a -> IO Object
-peekObjectDouble ptr = do
-  d <- (#peek msgpack_object, via.dec) ptr
-  return $ ObjectDouble $ realToFrac (d :: CDouble)
-
-peekObjectRAW :: Ptr a -> IO Object
-peekObjectRAW ptr = do
-  size <- (#peek msgpack_object, via.raw.size) ptr
-  p    <- (#peek msgpack_object, via.raw.ptr) ptr
-  bs   <- BS.packCStringLen (p, fromIntegral (size :: Word32))
-  return $ ObjectRAW bs
-
-peekObjectArray :: Ptr a -> IO Object
-peekObjectArray ptr = do
-  size <- (#peek msgpack_object, via.array.size) ptr
-  p    <- (#peek msgpack_object, via.array.ptr) ptr
-  objs <- mapM (\i -> peekObject $ p `plusPtr`
-                      ((#size msgpack_object) * i))
-          [0..size-1]
-  return $ ObjectArray objs
-
-peekObjectMap :: Ptr a -> IO Object
-peekObjectMap ptr = do
-  size <- (#peek msgpack_object, via.map.size) ptr
-  p    <- (#peek msgpack_object, via.map.ptr) ptr
-  dat  <- mapM (\i -> peekObjectKV $ p `plusPtr`
-                      ((#size msgpack_object_kv) * i))
-          [0..size-1]
-  return $ ObjectMap dat
-
-peekObjectKV :: Ptr a -> IO (Object, Object)
-peekObjectKV ptr = do
-  k <- peekObject $ ptr `plusPtr` (#offset msgpack_object_kv, key)
-  v <- peekObject $ ptr `plusPtr` (#offset msgpack_object_kv, val)
-  return (k, v)
-
--- | Pack a Object.
-packObject :: Packer -> Object -> IO ()
-packObject pc ObjectNil = packNil pc >> return ()
-
-packObject pc (ObjectBool b) = packBool pc b >> return ()
-
-packObject pc (ObjectInteger n) = packInt pc n >> return ()
-
-packObject pc (ObjectDouble d) = packDouble pc d >> return ()
-
-packObject pc (ObjectRAW bs) = packRAW' pc bs >> return ()
-
-packObject pc (ObjectArray ls) = do
-  packArray pc (length ls)
-  mapM_ (packObject pc) ls
-
-packObject pc (ObjectMap ls) = do
-  packMap pc (length ls)
-  mapM_ (\(a, b) -> packObject pc a >> packObject pc b) ls
-
-data UnpackReturn =
-  UnpackContinue     -- ^ not enough bytes to unpack object
-  | UnpackParseError -- ^ got invalid bytes
-  | UnpackError      -- ^ other error
-  deriving (Eq, Show)
-
--- | Unpack a single MessagePack object from byte sequence.
-unpackObject :: Zone -> ByteString -> IO (Either UnpackReturn (Int, Object))
-unpackObject z dat =
-  allocaBytes (#size msgpack_object) $ \ptr ->
-  BS.useAsCStringLen dat $ \(str, len) ->
-  alloca $ \poff -> do
-    ret <- msgpack_unpack str (fromIntegral len) poff z ptr
-    case ret of
-      (#const MSGPACK_UNPACK_SUCCESS) -> do
-        off <- peek poff
-        obj <- peekObject ptr
-        return $ Right (fromIntegral off, obj)
-      (#const MSGPACK_UNPACK_EXTRA_BYTES) -> do
-        off <- peek poff
-        obj <- peekObject ptr
-        return $ Right (fromIntegral off, obj)
-      (#const MSGPACK_UNPACK_CONTINUE) ->
-        return $ Left UnpackContinue
-      (#const MSGPACK_UNPACK_PARSE_ERROR) ->
-        return $ Left UnpackParseError
-      _ ->
-        return $ Left UnpackError
-
-foreign import ccall "msgpack_unpack" msgpack_unpack ::
-  Ptr CChar -> CSize -> Ptr CSize -> Zone -> Ptr () -> IO CInt

haskell/src/Data/MessagePack/Class.hs

@@ -1,97 +0,0 @@
-{-# LANGUAGE TypeSynonymInstances #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverlappingInstances #-}
-{-# LANGUAGE IncoherentInstances #-}
-
---------------------------------------------------------------------
--- |
--- Module    : Data.MessagePack.Class
--- Copyright : (c) Hideyuki Tanaka, 2009
--- License   : BSD3
---
--- Maintainer:  tanaka.hideyuki@gmail.com
--- Stability :  experimental
--- Portability: portable
---
--- Serializing Haskell values to and from MessagePack Objects.
---
---------------------------------------------------------------------
-
-module Data.MessagePack.Class(
-  -- * Serialization to and from Object
-  OBJECT(..),
-  Result,
-  pack,
-  ) where
-
-import Control.Monad.Error
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as C8
-import Data.Either
-
-import Data.MessagePack.Base
-
--- | The class of types serializable to and from MessagePack object
-class OBJECT a where
-  toObject :: a -> Object
-  fromObject :: Object -> Result a
-
--- | A type for parser results
-type Result a = Either String a
-
-instance OBJECT Object where
-  toObject = id
-  fromObject = Right
-
-fromObjectError :: String
-fromObjectError = "fromObject: cannot cast"
-
-instance OBJECT Int where
-  toObject = ObjectInteger
-  fromObject (ObjectInteger n) = Right n
-  fromObject _ = Left fromObjectError
-
-instance OBJECT Bool where
-  toObject = ObjectBool
-  fromObject (ObjectBool b) = Right b
-  fromObject _ = Left fromObjectError
-
-instance OBJECT Double where
-  toObject = ObjectDouble
-  fromObject (ObjectDouble d) = Right d
-  fromObject _ = Left fromObjectError
-
-instance OBJECT ByteString where
-  toObject = ObjectRAW
-  fromObject (ObjectRAW bs) = Right bs
-  fromObject _ = Left fromObjectError
-
-instance OBJECT String where
-  toObject = toObject . C8.pack
-  fromObject obj = liftM C8.unpack $ fromObject obj
-
-instance OBJECT a => OBJECT [a] where
-  toObject = ObjectArray . map toObject
-  fromObject (ObjectArray arr) =
-    mapM fromObject arr
-  fromObject _ =
-    Left fromObjectError
-
-instance (OBJECT a, OBJECT b) => OBJECT [(a, b)] where
-  toObject =
-    ObjectMap . map (\(a, b) -> (toObject a, toObject b))
-  fromObject (ObjectMap mem) = do
-    mapM (\(a, b) -> liftM2 (,) (fromObject a) (fromObject b)) mem
-  fromObject _ =
-    Left fromObjectError
-
-instance OBJECT a => OBJECT (Maybe a) where
-  toObject (Just a) = toObject a
-  toObject Nothing = ObjectNil
-  
-  fromObject ObjectNil = return Nothing
-  fromObject obj = liftM Just $ fromObject obj
-
--- | Pack a serializable Haskell value.
-pack :: OBJECT a => Packer -> a -> IO ()
-pack pc = packObject pc . toObject

haskell/src/Data/MessagePack/Feed.hs

@@ -1,59 +0,0 @@
---------------------------------------------------------------------
--- |
--- Module    : Data.MessagePack.Feed
--- Copyright : (c) Hideyuki Tanaka, 2009
--- License   : BSD3
---
--- Maintainer:  tanaka.hideyuki@gmail.com
--- Stability :  experimental
--- Portability: portable
---
--- Feeders for Stream Deserializers
---
---------------------------------------------------------------------
-
-module Data.MessagePack.Feed(
-  -- * Feeder type
-  Feeder,
-  -- * Feeders
-  feederFromHandle,
-  feederFromFile,
-  feederFromString,
-  ) where
-
-import Control.Monad
-import Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import Data.IORef
-import System.IO
-
--- | Feeder returns Just ByteString when bytes remains, otherwise Nothing.
-type Feeder = IO (Maybe ByteString)
-
--- | Feeder from Handle
-feederFromHandle :: Handle -> IO Feeder
-feederFromHandle h = return $ do
-  bs <- BS.hGet h bufSize
-  if BS.length bs > 0
-    then return $ Just bs
-    else do
-    hClose h
-    return Nothing
-  where
-    bufSize = 4096
-
--- | Feeder from File
-feederFromFile :: FilePath -> IO Feeder
-feederFromFile path =
-  openFile path ReadMode >>= feederFromHandle
-
--- | Feeder from ByteString
-feederFromString :: ByteString -> IO Feeder
-feederFromString bs = do
-  r <- newIORef (Just bs)
-  return $ f r
-  where
-    f r = do
-      mb <- readIORef r
-      writeIORef r Nothing
-      return mb

haskell/src/Data/MessagePack/Monad.hs

@@ -1,153 +0,0 @@
---------------------------------------------------------------------
--- |
--- Module    : Data.MessagePack.Monad
--- Copyright : (c) Hideyuki Tanaka, 2009
--- License   : BSD3
---
--- Maintainer:  tanaka.hideyuki@gmail.com
--- Stability :  experimental
--- Portability: portable
---
--- Monadic Stream Serializers and Deserializers
---
---------------------------------------------------------------------
-
-module Data.MessagePack.Monad(
-  -- * Classes
-  MonadPacker(..),
-  MonadUnpacker(..),
-  
-  -- * Packer and Unpacker type
-  PackerT(..),
-  UnpackerT(..),
-  
-  -- * Packers
-  packToString,
-  packToHandle,
-  packToFile,
-  
-  -- * Unpackers
-  unpackFrom,
-  unpackFromString,
-  unpackFromHandle,
-  unpackFromFile,
-  ) where
-
-import Control.Monad
-import Control.Monad.Trans
-import Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import System.IO
-
-import Data.MessagePack.Base hiding (Unpacker)
-import qualified Data.MessagePack.Base as Base
-import Data.MessagePack.Class
-import Data.MessagePack.Feed
-
-class Monad m => MonadPacker m where
-  -- | Serialize a object
-  put :: OBJECT a => a -> m ()
-
-class Monad m => MonadUnpacker m where
-  -- | Deserialize a object
-  get :: OBJECT a => m a
-
--- | Serializer Type
-newtype PackerT m r = PackerT { runPackerT :: Base.Packer -> m r }
-
-instance Monad m => Monad (PackerT m) where
-  a >>= b =
-    PackerT $ \pc -> do
-      r <- runPackerT a pc
-      runPackerT (b r) pc
-  
-  return r =
-    PackerT $ \_ -> return r
-
-instance MonadTrans PackerT where
-  lift m = PackerT $ \_ -> m
-
-instance MonadIO m => MonadIO (PackerT m) where
-  liftIO = lift . liftIO
-
-instance MonadIO m => MonadPacker (PackerT m) where
-  put v = PackerT $ \pc -> liftIO $ do
-    pack pc v
-
--- | Execute given serializer and returns byte sequence.
-packToString :: MonadIO m => PackerT m r -> m ByteString
-packToString m = do
-  sb <- liftIO $ newSimpleBuffer
-  pc <- liftIO $ newPacker sb
-  runPackerT m pc
-  liftIO $ simpleBufferData sb
-
--- | Execcute given serializer and write byte sequence to Handle.
-packToHandle :: MonadIO m => Handle -> PackerT m r -> m ()
-packToHandle h m = do
-  sb <- packToString m
-  liftIO $ BS.hPut h sb
-  liftIO $ hFlush h
-
--- | Execute given serializer and write byte sequence to file.
-packToFile :: MonadIO m => FilePath -> PackerT m r -> m ()
-packToFile p m = do
-  sb <- packToString m
-  liftIO $ BS.writeFile p sb
-
--- | Deserializer type
-newtype UnpackerT m r = UnpackerT { runUnpackerT :: Base.Unpacker -> Feeder -> m r }
-
-instance Monad m => Monad (UnpackerT m) where
-  a >>= b =
-    UnpackerT $ \up feed -> do
-      r <- runUnpackerT a up feed
-      runUnpackerT (b r) up feed
-  
-  return r =
-    UnpackerT $ \_ _ -> return r
-
-instance MonadTrans UnpackerT where
-  lift m = UnpackerT $ \_ _ -> m
-
-instance MonadIO m => MonadIO (UnpackerT m) where
-  liftIO = lift . liftIO
-
-instance MonadIO m => MonadUnpacker (UnpackerT m) where
-  get = UnpackerT $ \up feed -> liftIO $ do
-    resp <- unpackerExecute up
-    guard $ resp>=0
-    when (resp==0) $ do
-      Just bs <- feed
-      unpackerFeed up bs
-      resp2 <- unpackerExecute up
-      guard $ resp2==1
-    obj <- unpackerData up
-    freeZone =<< unpackerReleaseZone up
-    unpackerReset up
-    let Right r = fromObject obj
-    return r
-
--- | Execute deserializer using given feeder.
-unpackFrom :: MonadIO m => Feeder -> UnpackerT m r -> m r
-unpackFrom f m = do
-  up <- liftIO $ newUnpacker defaultInitialBufferSize
-  runUnpackerT m up f
-
--- | Execute deserializer using given handle.
-unpackFromHandle :: MonadIO m => Handle -> UnpackerT m r -> m r
-unpackFromHandle h m =
-  flip unpackFrom m =<< liftIO (feederFromHandle h)
-
--- | Execute deserializer using given file content.
-unpackFromFile :: MonadIO m => FilePath -> UnpackerT m r -> m r
-unpackFromFile p m = do
-  h <- liftIO $ openFile p ReadMode
-  r <- flip unpackFrom m =<< liftIO (feederFromHandle h)
-  liftIO $ hClose h
-  return r
-
--- | Execute deserializer from given byte sequence.
-unpackFromString :: MonadIO m => ByteString -> UnpackerT m r -> m r
-unpackFromString bs m = do
-  flip unpackFrom m =<< liftIO (feederFromString bs)

haskell/src/Data/MessagePack/Stream.hs

@@ -1,84 +0,0 @@
---------------------------------------------------------------------
--- |
--- Module    : Data.MessagePack.Stream
--- Copyright : (c) Hideyuki Tanaka, 2009
--- License   : BSD3
---
--- Maintainer:  tanaka.hideyuki@gmail.com
--- Stability :  experimental
--- Portability: portable
---
--- Lazy Stream Serializers and Deserializers
---
---------------------------------------------------------------------
-
-module Data.MessagePack.Stream(
-  unpackObjects,
-  unpackObjectsFromFile,
-  unpackObjectsFromHandle,
-  unpackObjectsFromString,
-  ) where
-
-import Control.Monad
-import Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import System.IO
-import System.IO.Unsafe
-
-import Data.MessagePack.Base
-import Data.MessagePack.Feed
-
--- | Unpack objects using given feeder.
-unpackObjects :: Feeder -> IO [Object]
-unpackObjects feeder = do
-  up <- newUnpacker defaultInitialBufferSize
-  f up
-  where
-  f up = unsafeInterleaveIO $ do
-    mbo <- unpackOnce up
-    case mbo of
-      Just o -> do
-        os <- f up
-        return $ o:os
-      Nothing ->
-        return []
-
-  unpackOnce up = do
-    resp <- unpackerExecute up
-    case resp of
-      0 -> do
-        r <- feedOnce up
-        if r
-          then unpackOnce up
-          else return Nothing
-      1 -> do
-        obj <- unpackerData up
-        freeZone =<< unpackerReleaseZone up
-        unpackerReset up
-        return $ Just obj
-      _ ->
-        error $ "unpackerExecute fails: " ++ show resp
-
-  feedOnce up = do
-    dat <- feeder
-    case dat of
-      Nothing ->
-        return False
-      Just bs -> do
-        unpackerFeed up bs
-        return True
-
--- | Unpack objects from file.
-unpackObjectsFromFile :: FilePath -> IO [Object]
-unpackObjectsFromFile fname =
-  unpackObjects =<< feederFromFile fname
-
--- | Unpack objects from handle.
-unpackObjectsFromHandle :: Handle -> IO [Object]
-unpackObjectsFromHandle h =
-  unpackObjects =<< feederFromHandle h
-  
--- | Unpack oobjects from given byte sequence.
-unpackObjectsFromString :: ByteString -> IO [Object]
-unpackObjectsFromString bs =
-  unpackObjects =<< feederFromString bs

haskell/test/Monad.hs

@@ -1,16 +0,0 @@
-import Control.Monad.Trans
-import Data.MessagePack
-
-main = do
-  sb <- packToString $ do
-    put [1,2,3::Int]
-    put (3.14 :: Double)
-    put "Hoge"
-  
-  print sb
-  
-  unpackFromString sb $ do
-    arr <- get
-    dbl <- get
-    str <- get
-    liftIO $ print (arr :: [Int], dbl :: Double, str :: String)

haskell/test/Stream.hs

@@ -1,14 +0,0 @@
-import Control.Applicative
-import qualified Data.ByteString as BS
-import Data.MessagePack
-
-main = do
-  sb <- newSimpleBuffer
-  pc <- newPacker sb
-  pack pc [1,2,3::Int]
-  pack pc True
-  pack pc "hoge"
-  bs <- simpleBufferData sb
-  
-  os <- unpackObjectsFromString bs
-  mapM_ print os

haskell/test/Test.hs

@@ -1,36 +0,0 @@
-import Control.Monad
-import Data.MessagePack
-
-{-
-main = do
-  sb <- newSimpleBuffer
-  pc <- newPacker sb
-  
-  pack pc [(1,2),(2,3),(3::Int,4::Int)]
-  pack pc [4,5,6::Int]
-  pack pc "hoge"
-  
-  bs <- simpleBufferData sb
-  print bs
-  
-  up <- newUnpacker defaultInitialBufferSize
-  
-  unpackerFeed up bs
-
-  let f = do
-        res <- unpackerExecute up
-        when (res==1) $ do
-          obj <- unpackerData up
-          print obj
-          f
-  
-  f
-
-  return ()
--}
-
-main = do
-  bs <- packb [(1,2),(2,3),(3::Int,4::Int)]
-  print bs
-  dat <- unpackb bs
-  print (dat :: Result [(Int, Int)])

java/.gitignore

@@ -1,4 +0,0 @@
-target
-.project
-.classpath
-*~

java/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +0,0 @@
-#Mon Apr 19 22:18:48 JST 2010
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6

java/Makefile

@@ -1,24 +0,0 @@
-
-.PHONY: compile test eclipse clean package
-
-all:
-	compile
-
-package:
-	mvn package
-
-install:
-	mvn install
-
-compile:
-	mvn compile
-
-test:
-	mvn test
-
-# generate .project and .classpath file for Eclipse
-eclipse:
-	mvn eclipse:eclipse
-
-clean:
-	mvn clean

java/README

@@ -1,28 +0,0 @@
-
-To build the JAR file of Message Pack, you need to install Maven (http://maven.apache.org), then type the following command:
-
-$ mvn package
-
-To locally install the project, type
-$ mvn install
-
-To generate project files (.project, .classpath) for Eclipse, do 
-
-$ mvn eclipse:eclipse
-
-then import the folder from your Eclipse. 
-
-Next, open the preference page in Eclipse and add the CLASSPATH variable:
-
-M2_REPO = $HOME/.m2/repository
-
-where $HOME is your home directory. In Windows XP, $HOME is:
-C:/Documents and Settings/(user name)/.m2/repository 
-
-
-# How to release the project (compile, test, tagging, deploy)
-
-$ mvn release:prepare
-$ mvn release:perform
-
-

java/build.xml

@@ -1,303 +0,0 @@
-<project name="MessagePack for Java" default="jar"
-    xmlns:ivy="antlib:org.apache.ivy.ant"
-    xmlns:mvn="urn:maven-artifact-ant">
-
-  <property name="Name" value="MessagePack"/>
-  <property name="name" value="msgpack"/>
-  <property name="version" value="0.0.1"/>
-  <property name="fullname" value="${name}-${version}"/>
-  <property name="year" value="2010"/>
-
-  <!-- Load user's default properties. -->
-  <property file="${user.home}/build.properties" />
-
-  <property name="src.dir" value="${basedir}/src/main/java"/>  	
-  <property name="java.src.dir" value="${src.dir}/"/>
-  <property name="build.dir" value="${basedir}/build"/>
-  <property name="lib.dir" value="${basedir}/lib"/>
-  <property name="dist.dir" value="${basedir}/dist"/>
-
-  <property name="build.classes" value="${build.dir}/classes"/>
-  <property name="build.doc" value="${build.dir}/doc"/>
-  <property name="build.javadoc" value="${build.doc}/api/"/>
-  <property name="build.javadoc.log" value="${build.dir}/javadoc.log"/>
-
-  <property name="test.count" value="100"/>
-  <property name="test.junit.output.format" value="plain"/>
-  <property name="test.java.src.dir" value="${basedir}/src/test/java"/>
-  <property name="test.java.build.dir" value="${build.dir}/test"/>
-  <property name="test.java.classes" value="${test.java.build.dir}/classes"/>
-  <property name="test.java.include" value="Test*"/>
- 
-  <property name="javac.encoding" value="ISO-8859-1"/>
-  <property name="javac.debug" value="on"/>
-  <property name="javac.optimize" value="on"/>
-  <property name="javac.deprecation" value="off"/>
-  <property name="javac.version" value="1.6"/>
-  <property name="javac.args" value=""/>
-  <property name="javac.args.warnings" value="-Xlint:unchecked"/>
-
-  <property name="javadoc.link.java"
-	    value="http://java.sun.com/javase/6/docs/api/"/>
-  <property name="javadoc.packages" value="org.${name}.*"/>
-
-  <!-- ivy settings -->
-  <property name="ivy.version" value="2.1.0"/>
-  <property name="ivy.url"
-	    value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
-  <property name="ivy.home" value="${user.home}/.ant" />
-  <property name="ivy.lib" value="${build.dir}/lib"/>
-  <property name="ivy.test.lib" value="${build.dir}/test/lib"/>
-  <property name="mvn.repo"
-	    value="https://repository.apache.org/content/repositories/snapshots"/>
-
-  <!-- the normal classpath -->
-  <path id="libs">
-    <fileset dir="${ivy.lib}">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-  <path id="java.classpath">
-    <pathelement location="${build.classes}"/>
-    <fileset dir="${lib.dir}">
-      <include name="**/*.jar" />
-      <exclude name="**/excluded/" />
-    </fileset>
-    <fileset dir="${ant.home}/lib">
-      <include name="ant.jar" />
-    </fileset>
-    <path refid="libs" />
-  </path>
-  <path id="test.libs">
-    <fileset dir="${ivy.test.lib}">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-  <path id="test.java.classpath">
-    <pathelement location="${test.java.classes}" />
-    <path refid="java.classpath"/>
-    <path refid="test.libs"/>
-  </path>
-
-  <!-- init & clean -->
-  <target name="init">
-    <mkdir dir="${build.dir}" />
-    <mkdir dir="${lib.dir}" />
-    <mkdir dir="${build.classes}" />
-
-    <mkdir dir="${test.java.build.dir}"/>
-    <mkdir dir="${test.java.classes}"/>
-
-    <mkdir dir="${ivy.lib}"/>
-    <mkdir dir="${ivy.test.lib}"/>
-    <condition property="ivy.jar.exists">
-      <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
-    </condition>
-  </target>
-  <target name="clean">
-    <delete dir="${build.dir}" />
-  </target>
-
-  <!-- ivy targets -->
-  <target name="ivy-download" unless="ivy.jar.exists" depends="init">
-    <delete dir="${lib.dir}"
-	    includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
-    <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
-         dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
-  </target>
-  <target name="ivy-init" depends="ivy-download" unless="ivy.initialized">
-    <taskdef resource="org/apache/ivy/ant/antlib.xml"
-             uri="antlib:org.apache.ivy.ant" classpathref="java.classpath"/>
-    <!-- ensure that ivy taskdef is only run once, otw ant will error -->
-    <property name="ivy.initialized" value="true"/>
-  </target>
-   
- <target name="ivy-retrieve-build" depends="init,ivy-init">
-    <ivy:retrieve type="jar" conf="build"
-		  pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
- </target>
- <target name="ivy-retrieve-test" depends="init,ivy-init">
-    <ivy:retrieve type="jar" conf="test"
-		  pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
- </target>
-
-  <!-- compiler -->
-  <macrodef name="java-compiler">
-    <attribute name="dest" default="${build.classes}"/>
-    <attribute name="includes" default="**/*.java"/>
-    <attribute name="excludes" default=""/>
-    <attribute name="classpath" default="java.classpath"/>
-    <element name="src" implicit="yes"/>
-    <sequential>
-      <javac 
-	 destdir="@{dest}"
-         includes="@{includes}"
-         excludes="@{excludes}" 
-	 encoding="${javac.encoding}" 
-	 debug="${javac.debug}"
-	 optimize="${javac.optimize}"
-	 target="${javac.version}"
-	 source="${javac.version}"
-	 deprecation="${javac.deprecation}">
-	<compilerarg line="${javac.args} ${javac.args.warnings}" />
-	<classpath refid="@{classpath}"/>
-        <src />
-      </javac>
-    </sequential>
-  </macrodef>
-
-  <!-- compile -->
-  <target name="compile" depends="init,ivy-retrieve-build">
-    <java-compiler>
-      <src path="${java.src.dir}"/>
-    </java-compiler>
-  </target>
-
-  <!-- test -->
-  <macrodef name="test-runner">
-    <attribute name="files.location" />
-    <attribute name="tests.pattern" />
-    <attribute name="test.dir" default="${test.java.build.dir}" />
-    <sequential>
-      <junit showoutput="yes"
-             printsummary="withOutAndErr"
-             haltonfailure="no"
-             fork="yes" forkMode="once"
-             errorProperty="tests.failed" failureProperty="tests.failed">
-        <sysproperty key="test.count" value="${test.count}"/>
-        <sysproperty key="test.dir" value="@{test.dir}"/>
-        <classpath refid="test.java.classpath"/>
-        <formatter type="${test.junit.output.format}"/>
-        <batchtest todir="${test.java.build.dir}" unless="testcase">
-          <fileset dir="@{files.location}"
-		   includes="@{tests.pattern}"
-		   excludes="**/${test.java.exclude}.java" />
-        </batchtest>
-        <batchtest todir="${test.java.build.dir}" if="testcase">
-          <fileset dir="@{files.location}" includes="**/${testcase}.java"/>
-        </batchtest>
-      </junit>
-      <fail if="tests.failed">Tests Failed!</fail>
-    </sequential>
-  </macrodef>
-  <target name="compile-test" depends="ivy-retrieve-test,compile">
-    <java-compiler dest="${test.java.classes}"
-		   classpath="test.java.classpath">
-      <src path="${test.java.src.dir}/org" />
-    </java-compiler>
-  </target>
-  <target name="test" depends="init,compile-test">
-    <test-runner files.location="${test.java.src.dir}"
-                 tests.pattern="**/${test.java.include}.java"/>
-  </target>
-
-  <!-- jar -->
-  <target name="jar" depends="compile">
-    <jar jarfile="${build.dir}/${name}-${version}.jar" basedir="${build.classes}" >
-      <manifest>
-        <section name="org/${name}">
-          <attribute name="Implementation-Title" value="${Name}"/>
-          <attribute name="Implementation-Version" value="${version}"/>
-        </section>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- javadoc -->
-  <target name="javadoc" depends="compile" description="Generate javadoc">
-    <mkdir dir="${build.javadoc}"/>
-    <record name="${build.javadoc.log}" action="start"/>
-    <javadoc
-      Locale="en_US"
-      packagenames="org.${org}.${name}.*"
-      destdir="${build.javadoc}"
-      encoding="UTF-8"
-      docencoding="UTF-8"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="${Name} ${version} API"
-      doctitle="${Name} ${version} API"
-      bottom="Copyright &amp;copy; ${year} The ${Name} Project"
-      >
-        <packageset dir="${java.src.dir}"/>
-        <link href="${javadoc.link.java}"/>
-        <classpath >
-          <path refid="java.classpath" />
-        </classpath>
-    </javadoc>
-    <record name="${build.javadoc.log}" action="stop"/>
-    <condition property="javadoc.warnings">
-      <isfileselected file="${build.javadoc.log}">
-	<contains text=": warning - "/>
-      </isfileselected>
-    </condition>
-    <fail if="javadoc.warnings">Javadoc warnings!</fail>
-  </target>
-  <target name="javadoc-jar" depends="javadoc">
-    <jar jarfile="${build.dir}/${fullname}-javadoc.jar">
-      <fileset dir="${build.javadoc}" includes="**/*"/>
-    </jar>
-  </target>
-
-  <!-- sources -->
-  <target name="source">
-    <jar jarfile="${build.dir}/${fullname}-sources.jar">
-      <fileset dir="${java.src.dir}" includes="**/*.java"/>
-    </jar>
-  </target>
-
-  <!-- pom -->
-  <target name="pom" depends="ivy-init">
-    <ivy:makepom ivyfile="${basedir}/ivy.xml"
-		 pomfile="${dist.dir}/${fullname}.pom">
-      <mapping conf="default" scope="compile"/>
-      <mapping conf="test" scope="test"/>
-    </ivy:makepom>
-  </target>
-
-  <!-- dist -->
-  <target name="dist" depends="jar, pom, source, javadoc-jar"
-	  description="Build distribution">
-    <mkdir dir="${dist.dir}"/>
-    <copy todir="${dist.dir}"> 
-      <fileset file="${build.dir}/${fullname}.jar"/>
-      <fileset file="${build.dir}/${fullname}-sources.jar"/>
-      <fileset file="${build.dir}/${fullname}-javadoc.jar"/>
-    </copy>
-  </target>
-
-  <!-- maven: install msgpack into local m2 cache -->
-  <target name="mvn-install" depends="jar, pom, source, javadoc-jar"
-	  description="Installs msgpack to local m2 cache">
-    <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-	     uri="urn:maven-artifact-ant"
-	     classpathref="java.classpath"/>
-    <mvn:pom file="${dist.dir}/${fullname}.pom" id="msgpack"/>
-    <mvn:install file="${build.dir}/${fullname}.jar">
-      <attach file="${build.dir}/${fullname}-sources.jar"
-           classifier="sources" />
-      <attach file="${build.dir}/${fullname}-javadoc.jar"
-           classifier="javadoc" />
-      <pom refid="msgpack"/>
-    </mvn:install>
-  </target>
-
-  <!-- maven: create local repository into ${basedir}/maven2 -->
-  <target name="mvn-deploy" depends="jar, pom, source, javadoc-jar"
-     description="Deploys MessagePack to Maven repo.">
-    <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-	     uri="urn:maven-artifact-ant"
-	     classpathref="java.classpath"/>
-    <mvn:pom file="${dist.dir}/${fullname}.pom" id="msgpack"/>
-    <mvn:deploy file="${build.dir}/${fullname}.jar">
-      <remoteRepository url="file://localhost/${basedir}/maven2/"/>
-      <attach file="${build.dir}/${fullname}-sources.jar"
-           classifier="sources" />
-      <attach file="${build.dir}/${fullname}-javadoc.jar"
-           classifier="javadoc" />
-      <pom refid="msgpack"/>
-    </mvn:deploy>
-  </target>
-
-</project>

java/ivy.xml

@@ -1,19 +0,0 @@
-<ivy-module version="2.0"
-            xmlns:e="http://ant.apache.org/ivy/extra">
-
-  <info organisation="org"
-    module="${name}" revision="${version}">
-    <ivyauthor name="MessagePack Project" url="http://msgpack.sourceforge.net/"/>
-    <description>MessagePack</description>
-  </info>
-
-  <configurations defaultconfmapping="default">
-    <conf name="default"/> <!-- "runtime" configuration -->
-    <conf name="test"/>
-    <conf name="build" extends="default"/>
-  </configurations>
-
-  <dependencies>
-    <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
-  </dependencies>
-</ivy-module>

java/pom.xml

@@ -1,109 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.msgpack</groupId>
-  <artifactId>msgpack</artifactId>
-  <name>MessagePack for Java</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>MessagePack for Java</description>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <connection>scm:git://github.com/msgpack/msgpack.git</connection>
-  </scm>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-      </testResource>
-    </testResources>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-      	<artifactId>maven-eclipse-plugin</artifactId>
-      	<version>2.5.1</version>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <!--  do not run site-deploy goal, which is included in the default setting  -->
-          <goals>deploy</goals>
-          <connectionUrl>scm:git://github.com/msgpack/msgpack.git</connectionUrl>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <reporting>
-    <plugins>
-      <!-- Generating JavaDoc -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <doctitle>${project.name} ${project.version} API</doctitle>
-          <aggregate>true</aggregate>
-          <locale>en_US</locale>
-	  <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-      
-      <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <profiles>
-    <!-- for sending artifacts to sourceforge.net repository -->
-    <profile>
-      <id>sourceforge</id>
-      <distributionManagement>
-	<repository>
-          <id>sourceforge.net</id>
-          <name>Repository at sourceforge.net</name>
-          <url>scpexe://shell.sourceforge.net/home/groups/m/ms/msgpack/htdocs/maven2/</url>
-	</repository>
-      </distributionManagement>
-    </profile>
-  </profiles>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-</project>

java/src/main/java/org/msgpack/MessageMergeable.java

@@ -1,23 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack;
-
-public interface MessageMergeable {
-	public void messageMerge(Object obj) throws MessageTypeException;
-}
-

java/src/main/java/org/msgpack/MessagePackable.java

@@ -1,25 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack;
-
-import java.io.IOException;
-
-public interface MessagePackable {
-	public void messagePack(Packer pk) throws IOException;
-}
-

java/src/main/java/org/msgpack/MessageTypeException.java

@@ -1,39 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack;
-
-import java.io.IOException;
-
-public class MessageTypeException extends IOException {
-	public MessageTypeException() { }
-
-	public MessageTypeException(String s) {
-		super(s);
-	}
-
-	public static MessageTypeException invalidConvert(Object from, Schema to) {
-		return new MessageTypeException(from.getClass().getName()+" cannot be convert to "+to.getExpression());
-	}
-
-	/* FIXME
-	public static MessageTypeException schemaMismatch(Schema to) {
-		return new MessageTypeException("schema mismatch "+to.getExpression());
-	}
-	*/
-}
-

java/src/main/java/org/msgpack/Packer.java

@@ -1,408 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack;
-
-import java.io.OutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-
-public class Packer {
-	protected byte[] castBytes = new byte[9];
-	protected ByteBuffer castBuffer = ByteBuffer.wrap(castBytes);
-	protected OutputStream out;
-
-	public Packer(OutputStream out) {
-		this.out = out;
-	}
-
-	public Packer packByte(byte d) throws IOException {
-		if(d < -(1<<5)) {
-			castBytes[0] = (byte)0xd1;
-			castBytes[1] = d;
-			out.write(castBytes, 0, 2);
-		} else {
-			out.write(d);
-		}
-		return this;
-	}
-
-	public Packer packShort(short d) throws IOException {
-		if(d < -(1<<5)) {
-			if(d < -(1<<7)) {
-				// signed 16
-				castBytes[0] = (byte)0xd1;
-				castBuffer.putShort(1, d);
-				out.write(castBytes, 0, 3);
-			} else {
-				// signed 8
-				castBytes[0] = (byte)0xd0;
-				castBytes[1] = (byte)d;
-				out.write(castBytes, 0, 2);
-			}
-		} else if(d < (1<<7)) {
-			// fixnum
-			out.write((byte)d);
-		} else {
-			if(d < (1<<8)) {
-				// unsigned 8
-				castBytes[0] = (byte)0xcc;
-				castBytes[1] = (byte)d;
-				out.write(castBytes, 0, 2);
-			} else {
-				// unsigned 16
-				castBytes[0] = (byte)0xcd;
-				castBuffer.putShort(1, d);
-				out.write(castBytes, 0, 3);
-			}
-		}
-		return this;
-	}
-
-	public Packer packInt(int d) throws IOException {
-		if(d < -(1<<5)) {
-			if(d < -(1<<15)) {
-				// signed 32
-				castBytes[0] = (byte)0xd2;
-				castBuffer.putInt(1, d);
-				out.write(castBytes, 0, 5);
-			} else if(d < -(1<<7)) {
-				// signed 16
-				castBytes[0] = (byte)0xd1;
-				castBuffer.putShort(1, (short)d);
-				out.write(castBytes, 0, 3);
-			} else {
-				// signed 8
-				castBytes[0] = (byte)0xd0;
-				castBytes[1] = (byte)d;
-				out.write(castBytes, 0, 2);
-			}
-		} else if(d < (1<<7)) {
-			// fixnum
-			out.write((byte)d);
-		} else {
-			if(d < (1<<8)) {
-				// unsigned 8
-				castBytes[0] = (byte)0xcc;
-				castBytes[1] = (byte)d;
-				out.write(castBytes, 0, 2);
-			} else if(d < (1<<16)) {
-				// unsigned 16
-				castBytes[0] = (byte)0xcd;
-				castBuffer.putShort(1, (short)d);
-				out.write(castBytes, 0, 3);
-			} else {
-				// unsigned 32
-				castBytes[0] = (byte)0xce;
-				castBuffer.putInt(1, d);
-				out.write(castBytes, 0, 5);
-			}
-		}
-		return this;
-	}
-
-	public Packer packLong(long d) throws IOException {
-		if(d < -(1L<<5)) {
-			if(d < -(1L<<15)) {
-				if(d < -(1L<<31)) {
-					// signed 64
-					castBytes[0] = (byte)0xd3;
-					castBuffer.putLong(1, d);
-					out.write(castBytes, 0, 9);
-				} else {
-					// signed 32
-					castBytes[0] = (byte)0xd2;
-					castBuffer.putInt(1, (int)d);
-					out.write(castBytes, 0, 5);
-				}
-			} else {
-				if(d < -(1<<7)) {
-					// signed 16
-					castBytes[0] = (byte)0xd1;
-					castBuffer.putShort(1, (short)d);
-					out.write(castBytes, 0, 3);
-				} else {
-					// signed 8
-					castBytes[0] = (byte)0xd0;
-					castBytes[1] = (byte)d;
-					out.write(castBytes, 0, 2);
-				}
-			}
-		} else if(d < (1<<7)) {
-			// fixnum
-			out.write((byte)d);
-		} else {
-			if(d < (1L<<16)) {
-				if(d < (1<<8)) {
-					// unsigned 8
-					castBytes[0] = (byte)0xcc;
-					castBytes[1] = (byte)d;
-					out.write(castBytes, 0, 2);
-				} else {
-					// unsigned 16
-					castBytes[0] = (byte)0xcd;
-					castBuffer.putShort(1, (short)d);
-					out.write(castBytes, 0, 3);
-					//System.out.println("pack uint 16 "+(short)d);
-				}
-			} else {
-				if(d < (1L<<32)) {
-					// unsigned 32
-					castBytes[0] = (byte)0xce;
-					castBuffer.putInt(1, (int)d);
-					out.write(castBytes, 0, 5);
-				} else {
-					// unsigned 64
-					castBytes[0] = (byte)0xcf;
-					castBuffer.putLong(1, d);
-					out.write(castBytes, 0, 9);
-				}
-			}
-		}
-		return this;
-	}
-
-	public Packer packFloat(float d) throws IOException {
-		castBytes[0] = (byte)0xca;
-		castBuffer.putFloat(1, d);
-		out.write(castBytes, 0, 5);
-		return this;
-	}
-
-	public Packer packDouble(double d) throws IOException {
-		castBytes[0] = (byte)0xcb;
-		castBuffer.putDouble(1, d);
-		out.write(castBytes, 0, 9);
-		return this;
-	}
-
-	public Packer packNil() throws IOException {
-		out.write((byte)0xc0);
-		return this;
-	}
-
-	public Packer packTrue() throws IOException {
-		out.write((byte)0xc3);
-		return this;
-	}
-
-	public Packer packFalse() throws IOException {
-		out.write((byte)0xc2);
-		return this;
-	}
-
-	public Packer packArray(int n) throws IOException {
-		if(n < 16) {
-			final int d = 0x90 | n;
-			out.write((byte)d);
-		} else if(n < 65536) {
-			castBytes[0] = (byte)0xdc;
-			castBuffer.putShort(1, (short)n);
-			out.write(castBytes, 0, 3);
-		} else {
-			castBytes[0] = (byte)0xdd;
-			castBuffer.putInt(1, n);
-			out.write(castBytes, 0, 5);
-		}
-		return this;
-	}
-
-	public Packer packMap(int n) throws IOException {
-		if(n < 16) {
-			final int d = 0x80 | n;
-			out.write((byte)d);
-		} else if(n < 65536) {
-			castBytes[0] = (byte)0xde;
-			castBuffer.putShort(1, (short)n);
-			out.write(castBytes, 0, 3);
-		} else {
-			castBytes[0] = (byte)0xdf;
-			castBuffer.putInt(1, n);
-			out.write(castBytes, 0, 5);
-		}
-		return this;
-	}
-
-	public Packer packRaw(int n) throws IOException {
-		if(n < 32) {
-			final int d = 0xa0 | n;
-			out.write((byte)d);
-		} else if(n < 65536) {
-			castBytes[0] = (byte)0xda;
-			castBuffer.putShort(1, (short)n);
-			out.write(castBytes, 0, 3);
-		} else {
-			castBytes[0] = (byte)0xdb;
-			castBuffer.putInt(1, n);
-			out.write(castBytes, 0, 5);
-		}
-		return this;
-	}
-
-	public Packer packRawBody(byte[] b) throws IOException {
-		out.write(b);
-		return this;
-	}
-
-	public Packer packRawBody(byte[] b, int off, int length) throws IOException {
-		out.write(b, off, length);
-		return this;
-	}
-
-
-	public Packer packWithSchema(Object o, Schema s) throws IOException {
-		s.pack(this, o);
-		return this;
-	}
-
-
-	public Packer packString(String s) throws IOException {
-		byte[] b = ((String)s).getBytes("UTF-8");
-		packRaw(b.length);
-		return packRawBody(b);
-	}
-
-
-	public Packer pack(String o) throws IOException {
-		if(o == null) { return packNil(); }
-		return packString(o);
-	}
-
-	public Packer pack(MessagePackable o) throws IOException {
-		if(o == null) { return packNil(); }
-		o.messagePack(this);
-		return this;
-	}
-
-	public Packer pack(byte[] o) throws IOException {
-		if(o == null) { return packNil(); }
-		packRaw(o.length);
-		return packRawBody(o);
-	}
-
-	public Packer pack(List o) throws IOException {
-		if(o == null) { return packNil(); }
-		packArray(o.size());
-		for(Object i : o) { pack(i); }
-		return this;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Packer pack(Map o) throws IOException {
-		if(o == null) { return packNil(); }
-		packMap(o.size());
-		for(Map.Entry e : ((Map<Object,Object>)o).entrySet()) {
-			pack(e.getKey());
-			pack(e.getValue());
-		}
-		return this;
-	}
-
-	public Packer pack(Boolean o) throws IOException {
-		if(o == null) { return packNil(); }
-		if(o) {
-			return packTrue();
-		} else {
-			return packFalse();
-		}
-	}
-
-	public Packer pack(Byte o) throws IOException {
-		if(o == null) { return packNil(); }
-		return packByte(o);
-	}
-
-	public Packer pack(Short o) throws IOException {
-		if(o == null) { return packNil(); }
-		return packShort(o);
-	}
-
-	public Packer pack(Integer o) throws IOException {
-		if(o == null) { return packNil(); }
-		return packInt(o);
-	}
-
-	public Packer pack(Long o) throws IOException {
-		if(o == null) { return packNil(); }
-		return packLong(o);
-	}
-
-	public Packer pack(Float o) throws IOException {
-		if(o == null) { return packNil(); }
-		return packFloat(o);
-	}
-
-	public Packer pack(Double o) throws IOException {
-		if(o == null) { return packNil(); }
-		return packDouble(o);
-	}
-
-
-	@SuppressWarnings("unchecked")
-	public Packer pack(Object o) throws IOException {
-		if(o == null) {
-			return packNil();
-		} else if(o instanceof String) {
-			byte[] b = ((String)o).getBytes("UTF-8");
-			packRaw(b.length);
-			return packRawBody(b);
-		} else if(o instanceof MessagePackable) {
-			((MessagePackable)o).messagePack(this);
-			return this;
-		} else if(o instanceof byte[]) {
-			byte[] b = (byte[])o;
-			packRaw(b.length);
-			return packRawBody(b);
-		} else if(o instanceof List) {
-			List<Object> l = (List<Object>)o;
-			packArray(l.size());
-			for(Object i : l) { pack(i); }
-			return this;
-		} else if(o instanceof Map) {
-			Map<Object,Object> m = (Map<Object,Object>)o;
-			packMap(m.size());
-			for(Map.Entry e : m.entrySet()) {
-				pack(e.getKey());
-				pack(e.getValue());
-			}
-			return this;
-		} else if(o instanceof Boolean) {
-			if((Boolean)o) {
-				return packTrue();
-			} else {
-				return packFalse();
-			}
-		} else if(o instanceof Integer) {
-			return packInt((Integer)o);
-		} else if(o instanceof Long) {
-			return packLong((Long)o);
-		} else if(o instanceof Short) {
-			return packShort((Short)o);
-		} else if(o instanceof Byte) {
-			return packByte((Byte)o);
-		} else if(o instanceof Float) {
-			return packFloat((Float)o);
-		} else if(o instanceof Double) {
-			return packDouble((Double)o);
-		} else {
-			throw new IOException("unknown object "+o+" ("+o.getClass()+")");
-		}
-	}
-}
-

java/src/main/java/org/msgpack/Schema.java

@@ -1,133 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack;
-
-import java.io.Writer;
-import java.io.IOException;
-import org.msgpack.schema.SSchemaParser;
-import org.msgpack.schema.ClassGenerator;
-
-public abstract class Schema {
-	private String expression;
-	private String name;
-
-	public Schema(String name) {
-		this.expression = expression;
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getFullName() {
-		return name;
-	}
-
-	public String getExpression() {
-		return name;
-	}
-
-	public static Schema parse(String source) {
-		return SSchemaParser.parse(source);
-	}
-
-	public static Schema load(String source) {
-		return SSchemaParser.load(source);
-	}
-
-	public void write(Writer output) throws IOException {
-		ClassGenerator.write(this, output);
-	}
-
-	public abstract void pack(Packer pk, Object obj) throws IOException;
-
-	public abstract Object convert(Object obj) throws MessageTypeException;
-
-
-	public Object createFromNil() {
-		return null;
-	}
-
-	public Object createFromBoolean(boolean v) {
-		throw new RuntimeException("type error");
-	}
-
-	public Object createFromByte(byte v) {
-		throw new RuntimeException("type error");
-	}
-
-	public Object createFromShort(short v) {
-		throw new RuntimeException("type error");
-	}
-
-	public Object createFromInt(int v) {
-		throw new RuntimeException("type error");
-	}
-
-	public Object createFromLong(long v) {
-		throw new RuntimeException("type error");
-	}
-
-	public Object createFromFloat(float v) {
-		throw new RuntimeException("type error");
-	}
-
-	public Object createFromDouble(double v) {
-		throw new RuntimeException("type error");
-	}
-
-	public Object createFromRaw(byte[] b, int offset, int length) {
-		throw new RuntimeException("type error");
-	}
-
-	/* FIXME
-	public Object createFromBoolean(boolean v) {
-		throw MessageTypeException.schemaMismatch(this);
-	}
-
-	public Object createFromByte(byte v) {
-		throw MessageTypeException.schemaMismatch(this);
-	}
-
-	public Object createFromShort(short v) {
-		throw MessageTypeException.schemaMismatch(this);
-	}
-
-	public Object createFromInt(int v) {
-		throw MessageTypeException.schemaMismatch(this);
-	}
-
-	public Object createFromLong(long v) {
-		throw MessageTypeException.schemaMismatch(this);
-	}
-
-	public Object createFromFloat(float v) {
-		throw MessageTypeException.schemaMismatch(this);
-	}
-
-	public Object createFromDouble(double v) {
-		throw MessageTypeException.schemaMismatch(this);
-	}
-
-	public Object createFromRaw(byte[] b, int offset, int length) {
-		throw MessageTypeException.schemaMismatch(this);
-	}
-	*/
-}
-

java/src/main/java/org/msgpack/UnbufferedUnpacker.java

@@ -1,82 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack;
-
-import java.lang.Iterable;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import org.msgpack.impl.UnpackerImpl;
-
-public class UnbufferedUnpacker extends UnpackerImpl {
-	private int offset;
-	private boolean finished;
-	private Object data;
-
-	public UnbufferedUnpacker() {
-		super();
-		this.offset = 0;
-		this.finished = false;
-	}
-
-	public UnbufferedUnpacker useSchema(Schema s) {
-		super.setSchema(s);
-		return this;
-	}
-
-	public Object getData() {
-		return data;
-	}
-
-	public boolean isFinished() {
-		return finished;
-	}
-
-	public void reset() {
-		super.reset();
-		this.offset = 0;
-	}
-
-	int getOffset() {
-		return offset;
-	}
-
-	void setOffset(int offset) {
-		this.offset = offset;
-	}
-
-	public int execute(byte[] buffer) throws UnpackException {
-		return execute(buffer, 0, buffer.length);
-	}
-
-	// FIXME
-	public int execute(byte[] buffer, int offset, int length) throws UnpackException
-	{
-		int noffset = super.execute(buffer, offset + this.offset, length);
-		this.offset = noffset - offset;
-		if(super.isFinished()) {
-			this.data = super.getData();
-			this.finished = true;
-			super.reset();
-		} else {
-			this.finished = false;
-		}
-		return noffset;
-	}
-}
-

java/src/main/java/org/msgpack/UnpackIterator.java

@@ -1,66 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-public class UnpackIterator implements Iterator<Object> {
-	private Unpacker pac;
-	private boolean have;
-	private Object data;
-
-	UnpackIterator(Unpacker pac) {
-		this.pac = pac;
-		this.have = false;
-	}
-
-	public boolean hasNext() {
-		if(have) { return true; }
-		try {
-			while(true) {
-				if(pac.execute()) {
-					data = pac.getData();
-					pac.reset();
-					have = true;
-					return true;
-				}
-
-				if(!pac.fill()) {
-					return false;
-				}
-			}
-		} catch (IOException e) {
-			return false;
-		}
-	}
-
-	public Object next() {
-		if(!have && !hasNext()) {
-			throw new NoSuchElementException();
-		}
-		have = false;
-		return data;
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-}
-

java/src/main/java/org/msgpack/Unpacker.java

@@ -1,254 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack;
-
-import java.lang.Iterable;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import java.nio.ByteBuffer;
-import org.msgpack.impl.UnpackerImpl;
-
-public class Unpacker extends UnpackerImpl implements Iterable<Object> {
-
-	public static final int DEFAULT_BUFFER_SIZE = 32*1024;
-
-	private int used;
-	private int offset;
-	private int parsed;
-	private byte[] buffer;
-	private int bufferReserveSize;
-	private InputStream stream;
-
-	public Unpacker() {
-		this(DEFAULT_BUFFER_SIZE);
-	}
-
-	public Unpacker(int bufferReserveSize) {
-		this(null, bufferReserveSize);
-	}
-
-	public Unpacker(InputStream stream) {
-		this(stream, DEFAULT_BUFFER_SIZE);
-	}
-
-	public Unpacker(InputStream stream, int bufferReserveSize) {
-		super();
-		this.used = 0;
-		this.offset = 0;
-		this.parsed = 0;
-		this.buffer = new byte[bufferReserveSize];
-		this.bufferReserveSize = bufferReserveSize/2;
-		this.stream = stream;
-	}
-
-	public Unpacker useSchema(Schema s) {
-		super.setSchema(s);
-		return this;
-	}
-
-	public void reserveBuffer(int size) {
-		if(buffer.length - used >= size) {
-			return;
-		}
-		/*
-		if(used == parsed && buffer.length >= size) {
-			// rewind buffer
-			used = 0;
-			offset = 0;
-			return;
-		}
-		*/
-
-		int nextSize = buffer.length * 2;
-		while(nextSize < size + used) {
-			nextSize *= 2;
-		}
-
-		byte[] tmp = new byte[nextSize];
-		System.arraycopy(buffer, offset, tmp, 0, used - offset);
-
-		buffer = tmp;
-		used -= offset;
-		offset = 0;
-	}
-
-	public byte[] getBuffer() {
-		return buffer;
-	}
-
-	public int getBufferOffset() {
-		return used;
-	}
-
-	public int getBufferCapacity() {
-		return buffer.length - used;
-	}
-
-	public void bufferConsumed(int size) {
-		used += size;
-	}
-
-	public void feed(ByteBuffer buffer) {
-		int length = buffer.remaining();
-		if (length == 0) return;
-		reserveBuffer(length);
-		buffer.get(this.buffer, this.offset, length);
-		bufferConsumed(length);
-	}
-
-	public void feed(byte[] buffer) {
-		feed(buffer, 0, buffer.length);
-	}
-
-	public void feed(byte[] buffer, int offset, int length) {
-		reserveBuffer(length);
-		System.arraycopy(buffer, offset, this.buffer, this.offset, length);
-		bufferConsumed(length);
-	}
-
-	public boolean fill() throws IOException {
-		if(stream == null) {
-			return false;
-		}
-		reserveBuffer(bufferReserveSize);
-		int rl = stream.read(getBuffer(), getBufferOffset(), getBufferCapacity());
-		if(rl <= 0) {
-			return false;
-		}
-		bufferConsumed(rl);
-		return true;
-	}
-
-	public Iterator<Object> iterator() {
-		return new UnpackIterator(this);
-	}
-
-	public boolean execute() throws UnpackException {
-		int noffset = super.execute(buffer, offset, used);
-		if(noffset <= offset) {
-			return false;
-		}
-		parsed += noffset - offset;
-		offset = noffset;
-		return super.isFinished();
-	}
-
-	public Object getData() {
-		return super.getData();
-	}
-
-	public void reset() {
-		super.reset();
-		parsed = 0;
-	}
-
-	public int getMessageSize() {
-		return parsed - offset + used;
-	}
-
-	public int getParsedSize() {
-		return parsed;
-	}
-
-	public int getNonParsedSize() {
-		return used - offset;
-	}
-
-	public void skipNonparsedBuffer(int size) {
-		offset += size;
-	}
-
-	public void removeNonparsedBuffer() {
-		used = offset;
-	}
-
-	/*
-	public static class Context {
-		private boolean finished;
-		private Object data;
-		private int offset;
-		private UnpackerImpl impl;
-
-		public Context()
-		{
-			this.finished = false;
-			this.impl = new UnpackerImpl();
-		}
-
-		public boolean isFinished()
-		{
-			return finished;
-		}
-
-		public Object getData()
-		{
-			return data;
-		}
-
-		int getOffset()
-		{
-			return offset;
-		}
-
-		void setFinished(boolean finished)
-		{
-			this.finished = finished;
-		}
-
-		void setData(Object data)
-		{
-			this.data = data;
-		}
-
-		void setOffset(int offset)
-		{
-			this.offset = offset;
-		}
-
-		UnpackerImpl getImpl()
-		{
-			return impl;
-		}
-	}
-
-	public static int unpack(Context ctx, byte[] buffer) throws UnpackException
-	{
-		return unpack(ctx, buffer, 0, buffer.length);
-	}
-
-	public static int unpack(Context ctx, byte[] buffer, int offset, int length) throws UnpackException
-	{
-		UnpackerImpl impl = ctx.getImpl();
-		int noffset = impl.execute(buffer, offset + ctx.getOffset(), length);
-		ctx.setOffset(noffset - offset);
-		if(impl.isFinished()) {
-			ctx.setData(impl.getData());
-			ctx.setFinished(false);
-			impl.reset();
-		} else {
-			ctx.setData(null);
-			ctx.setFinished(true);
-		}
-		int parsed = noffset - offset;
-		ctx.setOffset(parsed);
-		return noffset;
-	}
-	*/
-}
-

java/src/main/java/org/msgpack/impl/UnpackerImpl.java

@@ -1,500 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.impl;
-
-import java.nio.ByteBuffer;
-//import java.math.BigInteger;
-import org.msgpack.*;
-import org.msgpack.schema.GenericSchema;
-import org.msgpack.schema.IMapSchema;
-import org.msgpack.schema.IArraySchema;
-
-public class UnpackerImpl {
-	static final int CS_HEADER      = 0x00;
-	static final int CS_FLOAT       = 0x0a;
-	static final int CS_DOUBLE      = 0x0b;
-	static final int CS_UINT_8      = 0x0c;
-	static final int CS_UINT_16     = 0x0d;
-	static final int CS_UINT_32     = 0x0e;
-	static final int CS_UINT_64     = 0x0f;
-	static final int CS_INT_8       = 0x10;
-	static final int CS_INT_16      = 0x11;
-	static final int CS_INT_32      = 0x12;
-	static final int CS_INT_64      = 0x13;
-	static final int CS_RAW_16      = 0x1a;
-	static final int CS_RAW_32      = 0x1b;
-	static final int CS_ARRAY_16    = 0x1c;
-	static final int CS_ARRAY_32    = 0x1d;
-	static final int CS_MAP_16      = 0x1e;
-	static final int CS_MAP_32      = 0x1f;
-	static final int ACS_RAW_VALUE  = 0x20;
-	static final int CT_ARRAY_ITEM  = 0x00;
-	static final int CT_MAP_KEY     = 0x01;
-	static final int CT_MAP_VALUE   = 0x02;
-
-	static final int MAX_STACK_SIZE = 16;
-
-	private int cs;
-	private int trail;
-	private int top;
-	private int[]    stack_ct       = new int[MAX_STACK_SIZE];
-	private int[]    stack_count    = new int[MAX_STACK_SIZE];
-	private Object[] stack_obj      = new Object[MAX_STACK_SIZE];
-	private Schema[] stack_schema   = new Schema[MAX_STACK_SIZE];
-	private int top_ct;
-	private int top_count;
-	private Object top_obj;
-	private Schema top_schema;
-	private ByteBuffer castBuffer   = ByteBuffer.allocate(8);
-	private boolean finished = false;
-	private Object data = null;
-
-	private static final Schema GENERIC_SCHEMA = new GenericSchema();
-	private Schema rootSchema;
-
-	protected UnpackerImpl()
-	{
-		setSchema(GENERIC_SCHEMA);
-	}
-
-	protected void setSchema(Schema schema)
-	{
-		this.rootSchema = schema;
-		reset();
-	}
-
-	protected Object getData()
-	{
-		return data;
-	}
-
-	protected boolean isFinished()
-	{
-		return finished;
-	}
-
-	protected void reset()
-	{
-		cs = CS_HEADER;
-		top = -1;
-		finished = false;
-		data = null;
-		top_ct = 0;
-		top_count = 0;
-		top_obj = null;
-		top_schema = rootSchema;
-	}
-
-	@SuppressWarnings("unchecked")
-	protected int execute(byte[] src, int off, int length) throws UnpackException
-	{
-		if(off >= length) { return off; }
-
-		int limit = length;
-		int i = off;
-		int count;
-
-		Object obj = null;
-
-		_out: do {
-		_header_again: {
-			//System.out.println("while i:"+i+" limit:"+limit);
-
-			int b = src[i];
-
-			_push: {
-				_fixed_trail_again:
-				if(cs == CS_HEADER) {
-	
-					if((b & 0x80) == 0) {  // Positive Fixnum
-						//System.out.println("positive fixnum "+b);
-						obj = top_schema.createFromByte((byte)b);
-						break _push;
-					}
-	
-					if((b & 0xe0) == 0xe0) {  // Negative Fixnum
-						//System.out.println("negative fixnum "+b);
-						obj = top_schema.createFromByte((byte)b);
-						break _push;
-					}
-	
-					if((b & 0xe0) == 0xa0) {  // FixRaw
-						trail = b & 0x1f;
-						if(trail == 0) {
-							obj = top_schema.createFromRaw(new byte[0], 0, 0);
-							break _push;
-						}
-						cs = ACS_RAW_VALUE;
-						break _fixed_trail_again;
-					}
-	
-					if((b & 0xf0) == 0x90) {  // FixArray
-						if(top >= MAX_STACK_SIZE) {
-							throw new UnpackException("parse error");
-						}
-						if(!(top_schema instanceof IArraySchema)) {
-							throw new RuntimeException("type error");
-						}
-						count = b & 0x0f;
-						//System.out.println("fixarray count:"+count);
-						obj = new Object[count];
-						if(count == 0) { break _push; }  // FIXME check IArraySchema
-						++top;
-						stack_obj[top]    = top_obj;
-						stack_ct[top]     = top_ct;
-						stack_count[top]  = top_count;
-						stack_schema[top] = top_schema;
-						top_obj    = obj;
-						top_ct     = CT_ARRAY_ITEM;
-						top_count  = count;
-						top_schema = ((IArraySchema)top_schema).getElementSchema(0);
-						break _header_again;
-					}
-	
-					if((b & 0xf0) == 0x80) {  // FixMap
-						if(top >= MAX_STACK_SIZE) {
-							throw new UnpackException("parse error");
-						}
-						if(!(top_schema instanceof IMapSchema)) {
-							throw new RuntimeException("type error");
-						}
-						count = b & 0x0f;
-						obj = new Object[count*2];
-						if(count == 0) { break _push; }  // FIXME check IMapSchema
-						//System.out.println("fixmap count:"+count);
-						++top;
-						stack_obj[top]    = top_obj;
-						stack_ct[top]     = top_ct;
-						stack_count[top]  = top_count;
-						stack_schema[top] = top_schema;
-						top_obj    = obj;
-						top_ct     = CT_MAP_KEY;
-						top_count  = count;
-						top_schema = ((IMapSchema)top_schema).getKeySchema();
-						break _header_again;
-					}
-	
-					switch(b & 0xff) {    // FIXME
-					case 0xc0:  // nil
-						obj = top_schema.createFromNil();
-						break _push;
-					case 0xc2:  // false
-						obj = top_schema.createFromBoolean(false);
-						break _push;
-					case 0xc3:  // true
-						obj = top_schema.createFromBoolean(true);
-						break _push;
-					case 0xca:  // float
-					case 0xcb:  // double
-					case 0xcc:  // unsigned int  8
-					case 0xcd:  // unsigned int 16
-					case 0xce:  // unsigned int 32
-					case 0xcf:  // unsigned int 64
-					case 0xd0:  // signed int  8
-					case 0xd1:  // signed int 16
-					case 0xd2:  // signed int 32
-					case 0xd3:  // signed int 64
-						trail = 1 << (b & 0x03);
-						cs = b & 0x1f;
-						//System.out.println("a trail "+trail+"  cs:"+cs);
-						break _fixed_trail_again;
-					case 0xda:  // raw 16
-					case 0xdb:  // raw 32
-					case 0xdc:  // array 16
-					case 0xdd:  // array 32
-					case 0xde:  // map 16
-					case 0xdf:  // map 32
-						trail = 2 << (b & 0x01);
-						cs = b & 0x1f;
-						//System.out.println("b trail "+trail+"  cs:"+cs);
-						break _fixed_trail_again;
-					default:
-						//System.out.println("unknown b "+(b&0xff));
-						throw new UnpackException("parse error");
-					}
-	
-				}  // _fixed_trail_again
-
-				do {
-				_fixed_trail_again: {
-	
-					if(limit - i <= trail) { break _out; }
-					int n = i + 1;
-					i += trail;
-
-					switch(cs) {
-					case CS_FLOAT:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 4);
-						obj = top_schema.createFromFloat( castBuffer.getFloat(0) );
-						//System.out.println("float "+obj);
-						break _push;
-					case CS_DOUBLE:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 8);
-						obj = top_schema.createFromDouble( castBuffer.getDouble(0) );
-						//System.out.println("double "+obj);
-						break _push;
-					case CS_UINT_8:
-						//System.out.println(n);
-						//System.out.println(src[n]);
-						//System.out.println(src[n+1]);
-						//System.out.println(src[n-1]);
-						obj = top_schema.createFromShort( (short)((src[n]) & 0xff) );
-						//System.out.println("uint8 "+obj);
-						break _push;
-					case CS_UINT_16:
-						//System.out.println(src[n]);
-						//System.out.println(src[n+1]);
-						castBuffer.rewind();
-						castBuffer.put(src, n, 2);
-						obj = top_schema.createFromInt( ((int)castBuffer.getShort(0)) & 0xffff );
-						//System.out.println("uint 16 "+obj);
-						break _push;
-					case CS_UINT_32:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 4);
-						obj = top_schema.createFromLong( ((long)castBuffer.getInt(0)) & 0xffffffffL );
-						//System.out.println("uint 32 "+obj);
-						break _push;
-					case CS_UINT_64:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 8);
-						{
-							long o = castBuffer.getLong(0);
-							if(o < 0) {
-								// FIXME
-								//obj = GenericBigInteger.valueOf(o & 0x7fffffffL).setBit(31);
-								throw new UnpackException("uint 64 bigger than 0x7fffffff is not supported");
-							} else {
-								obj = top_schema.createFromLong( o );
-							}
-						}
-						break _push;
-					case CS_INT_8:
-						obj = top_schema.createFromByte(  src[n] );
-						break _push;
-					case CS_INT_16:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 2);
-						obj = top_schema.createFromShort( castBuffer.getShort(0) );
-						break _push;
-					case CS_INT_32:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 4);
-						obj = top_schema.createFromInt( castBuffer.getInt(0) );
-						break _push;
-					case CS_INT_64:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 8);
-						obj = top_schema.createFromLong( castBuffer.getLong(0) );
-						break _push;
-					case CS_RAW_16:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 2);
-						trail = ((int)castBuffer.getShort(0)) & 0xffff;
-						if(trail == 0) {
-							obj = top_schema.createFromRaw(new byte[0], 0, 0);
-							break _push;
-						}
-						cs = ACS_RAW_VALUE;
-						break _fixed_trail_again;
-					case CS_RAW_32:
-						castBuffer.rewind();
-						castBuffer.put(src, n, 4);
-						// FIXME overflow check
-						trail = castBuffer.getInt(0) & 0x7fffffff;
-						if(trail == 0) {
-							obj = top_schema.createFromRaw(new byte[0], 0, 0);
-							break _push;
-						}
-						cs = ACS_RAW_VALUE;
-					case ACS_RAW_VALUE:
-						obj = top_schema.createFromRaw(src, n, trail);
-						break _push;
-					case CS_ARRAY_16:
-						if(top >= MAX_STACK_SIZE) {
-							throw new UnpackException("parse error");
-						}
-						if(!(top_schema instanceof IArraySchema)) {
-							throw new RuntimeException("type error");
-						}
-						castBuffer.rewind();
-						castBuffer.put(src, n, 2);
-						count = ((int)castBuffer.getShort(0)) & 0xffff;
-						obj = new Object[count];
-						if(count == 0) { break _push; }  // FIXME check IArraySchema
-						++top;
-						stack_obj[top]    = top_obj;
-						stack_ct[top]     = top_ct;
-						stack_count[top]  = top_count;
-						stack_schema[top] = top_schema;
-						top_obj    = obj;
-						top_ct     = CT_ARRAY_ITEM;
-						top_count  = count;
-						top_schema = ((IArraySchema)top_schema).getElementSchema(0);
-						break _header_again;
-					case CS_ARRAY_32:
-						if(top >= MAX_STACK_SIZE) {
-							throw new UnpackException("parse error");
-						}
-						if(!(top_schema instanceof IArraySchema)) {
-							throw new RuntimeException("type error");
-						}
-						castBuffer.rewind();
-						castBuffer.put(src, n, 4);
-						// FIXME overflow check
-						count = castBuffer.getInt(0) & 0x7fffffff;
-						obj = new Object[count];
-						if(count == 0) { break _push; }  // FIXME check IArraySchema
-						++top;
-						stack_obj[top]    = top_obj;
-						stack_ct[top]     = top_ct;
-						stack_count[top]  = top_count;
-						stack_schema[top] = top_schema;
-						top_obj    = obj;
-						top_ct     = CT_ARRAY_ITEM;
-						top_count  = count;
-						top_schema = ((IArraySchema)top_schema).getElementSchema(0);
-						break _header_again;
-					case CS_MAP_16:
-						if(top >= MAX_STACK_SIZE) {
-							throw new UnpackException("parse error");
-						}
-						if(!(top_schema instanceof IMapSchema)) {
-							throw new RuntimeException("type error");
-						}
-						castBuffer.rewind();
-						castBuffer.put(src, n, 2);
-						count = ((int)castBuffer.getShort(0)) & 0xffff;
-						obj = new Object[count*2];
-						if(count == 0) { break _push; }  // FIXME check IMapSchema
-						//System.out.println("fixmap count:"+count);
-						++top;
-						stack_obj[top]    = top_obj;
-						stack_ct[top]     = top_ct;
-						stack_count[top]  = top_count;
-						stack_schema[top] = top_schema;
-						top_obj    = obj;
-						top_ct     = CT_MAP_KEY;
-						top_count  = count;
-						top_schema = ((IMapSchema)top_schema).getKeySchema();
-						break _header_again;
-					case CS_MAP_32:
-						if(top >= MAX_STACK_SIZE) {
-							throw new UnpackException("parse error");
-						}
-						if(!(top_schema instanceof IMapSchema)) {
-							throw new RuntimeException("type error");
-						}
-						castBuffer.rewind();
-						castBuffer.put(src, n, 4);
-						// FIXME overflow check
-						count = castBuffer.getInt(0) & 0x7fffffff;
-						obj = new Object[count*2];
-						if(count == 0) { break _push; }  // FIXME check IMapSchema
-						//System.out.println("fixmap count:"+count);
-						++top;
-						stack_obj[top]    = top_obj;
-						stack_ct[top]     = top_ct;
-						stack_count[top]  = top_count;
-						stack_schema[top] = top_schema;
-						top_obj    = obj;
-						top_ct     = CT_MAP_KEY;
-						top_count  = count;
-						top_schema = ((IMapSchema)top_schema).getKeySchema();
-						break _header_again;
-					default:
-						throw new UnpackException("parse error");
-					}
-
-				}  // _fixed_trail_again
-				}  while(true);
-			}  // _push
-
-			do {
-			_push: {
-				//System.out.println("push top:"+top);
-				if(top == -1) {
-					++i;
-					data = obj;
-					finished = true;
-					break _out;
-				}
-
-				switch(top_ct) {
-				case CT_ARRAY_ITEM: {
-						//System.out.println("array item "+obj);
-						Object[] ar = (Object[])top_obj;
-						ar[ar.length - top_count] = obj;
-						if(--top_count == 0) {
-							top_obj    = stack_obj[top];
-							top_ct     = stack_ct[top];
-							top_count  = stack_count[top];
-							top_schema = stack_schema[top];
-							obj = ((IArraySchema)top_schema).createFromArray(ar);
-							stack_obj[top] = null;
-							stack_schema[top] = null;
-							--top;
-							break _push;
-						} else {
-							top_schema = ((IArraySchema)stack_schema[top]).getElementSchema(ar.length - top_count);
-						}
-						break _header_again;
-					}
-				case CT_MAP_KEY: {
-						//System.out.println("map key:"+top+" "+obj);
-						Object[] mp = (Object[])top_obj;
-						mp[mp.length - top_count*2] = obj;
-						top_ct = CT_MAP_VALUE;
-						top_schema = ((IMapSchema)stack_schema[top]).getValueSchema();
-						break _header_again;
-					}
-				case CT_MAP_VALUE: {
-						//System.out.println("map value:"+top+" "+obj);
-						Object[] mp = (Object[])top_obj;
-						mp[mp.length - top_count*2 + 1] = obj;
-						if(--top_count == 0) {
-							top_obj    = stack_obj[top];
-							top_ct     = stack_ct[top];
-							top_count  = stack_count[top];
-							top_schema = stack_schema[top];
-							obj = ((IMapSchema)top_schema).createFromMap(mp);
-							stack_obj[top] = null;
-							stack_schema[top] = null;
-							--top;
-							break _push;
-						}
-						top_ct = CT_MAP_KEY;
-						break _header_again;
-					}
-				default:
-					throw new UnpackException("parse error");
-				}
-			}  // _push
-			} while(true);
-
-		}  // _header_again
-		cs = CS_HEADER;
-		++i;
-		} while(i < limit);  // _out
-
-		return i;
-	}
-}
-

java/src/main/java/org/msgpack/schema/ArraySchema.java

@@ -1,125 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.RandomAccess;
-import java.io.IOException;
-import org.msgpack.*;
-
-public class ArraySchema extends Schema implements IArraySchema {
-	private Schema elementSchema;
-
-	public ArraySchema(Schema elementSchema)
-	{
-		super("array");
-		this.elementSchema = elementSchema;
-	}
-
-	@Override
-	public String getFullName()
-	{
-		return "List<"+elementSchema.getFullName()+">";
-	}
-
-	@Override
-	public String getExpression()
-	{
-		return "(array "+elementSchema.getExpression()+")";
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void pack(Packer pk, Object obj) throws IOException
-	{
-		if(obj instanceof List) {
-			ArrayList<Object> d = (ArrayList<Object>)obj;
-			pk.packArray(d.size());
-			if(obj instanceof RandomAccess) {
-				for(int i=0; i < d.size(); ++i) {
-					elementSchema.pack(pk, d.get(i));
-				}
-			} else {
-				for(Object e : d) {
-					elementSchema.pack(pk, e);
-				}
-			}
-
-		} else if(obj instanceof Set) {
-			Set<Object> d = (Set<Object>)obj;
-			pk.packArray(d.size());
-			for(Object e : d) {
-				elementSchema.pack(pk, e);
-			}
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Object convert(Object obj) throws MessageTypeException
-	{
-		if(obj instanceof List) {
-			List d = (List)obj;
-			ArrayList ar = new ArrayList(d.size());
-			if(obj instanceof RandomAccess) {
-				for(int i=0; i < d.size(); ++i) {
-					ar.add( elementSchema.convert(d.get(i)) );
-				}
-			} else {
-				for(Object e : d) {
-					ar.add( elementSchema.convert(e) );
-				}
-			}
-			return ar;
-
-		} else if(obj instanceof Collection) {
-			Collection d = (Collection)obj;
-			ArrayList ar = new ArrayList(d.size());
-			for(Object e : (Collection)obj) {
-				ar.add( elementSchema.convert(e) );
-			}
-			return ar;
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Schema getElementSchema(int index)
-	{
-		return elementSchema;
-	}
-
-	@Override
-	public Object createFromArray(Object[] obj)
-	{
-		return Arrays.asList(obj);
-	}
-}
-

java/src/main/java/org/msgpack/schema/ByteSchema.java

@@ -1,89 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.io.IOException;
-import org.msgpack.*;
-
-public class ByteSchema extends Schema {
-	public ByteSchema() {
-		super("Byte");
-	}
-
-	@Override
-	public String getExpression() {
-		return "byte";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj instanceof Number) {
-			pk.packByte( ((Number)obj).byteValue() );
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Byte) {
-			return obj;
-
-		} else if(obj instanceof Number) {
-			return ((Number)obj).byteValue();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object createFromByte(byte v) {
-		return (byte)v;
-	}
-
-	@Override
-	public Object createFromShort(short v) {
-		return (byte)v;
-	}
-
-	@Override
-	public Object createFromInt(int v) {
-		return (byte)v;
-	}
-
-	@Override
-	public Object createFromLong(long v) {
-		return (byte)v;
-	}
-
-	@Override
-	public Object createFromFloat(float v) {
-		return (byte)v;
-	}
-
-	@Override
-	public Object createFromDouble(double v) {
-		return (byte)v;
-	}
-}
-

java/src/main/java/org/msgpack/schema/ClassGenerator.java

@@ -1,241 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.io.IOException;
-import java.io.File;
-import java.io.Writer;
-import org.msgpack.*;
-
-public class ClassGenerator {
-	private ClassSchema schema;
-	private Writer writer;
-	private int indent;
-
-	private ClassGenerator(Writer writer) {
-		this.writer = writer;
-		this.indent = 0;
-	}
-
-	public static void write(Schema schema, Writer dest) throws IOException {
-		if(!(schema instanceof ClassSchema)) {
-			throw new RuntimeException("schema is not class schema");
-		}
-		ClassSchema cs = (ClassSchema)schema;
-		new ClassGenerator(dest).run(cs);
-	}
-
-	private void run(ClassSchema cs) throws IOException {
-		List<ClassSchema> subclasses = new ArrayList<ClassSchema>();
-		for(FieldSchema f : cs.getFields()) {
-			findSubclassSchema(subclasses, f.getSchema());
-		}
-
-		for(ClassSchema sub : subclasses) {
-			sub.setNamespace(cs.getNamespace());
-			sub.setImports(cs.getImports());
-		}
-
-		this.schema = cs;
-
-		writeHeader();
-
-		writeClass();
-
-		for(ClassSchema sub : subclasses) {
-			this.schema = sub;
-			writeSubclass();
-		}
-
-		writeFooter();
-
-		this.schema = null;
-		writer.flush();
-	}
-
-	private void findSubclassSchema(List<ClassSchema> dst, Schema s) {
-		if(s instanceof ClassSchema) {
-			ClassSchema cs = (ClassSchema)s;
-			if(!dst.contains(cs)) { dst.add(cs); }
-			for(FieldSchema f : cs.getFields()) {
-				findSubclassSchema(dst, f.getSchema());
-			}
-		} else if(s instanceof ArraySchema) {
-			ArraySchema as = (ArraySchema)s;
-			findSubclassSchema(dst, as.getElementSchema(0));
-		} else if(s instanceof MapSchema) {
-			MapSchema as = (MapSchema)s;
-			findSubclassSchema(dst, as.getKeySchema());
-			findSubclassSchema(dst, as.getValueSchema());
-		}
-	}
-
-	private void writeHeader() throws IOException {
-		if(schema.getNamespace() != null) {
-			line("package "+schema.getNamespace()+";");
-			line();
-		}
-		line("import java.util.*;");
-		line("import java.io.*;");
-		line("import org.msgpack.*;");
-		line("import org.msgpack.schema.ClassSchema;");
-		line("import org.msgpack.schema.FieldSchema;");
-	}
-
-	private void writeFooter() throws IOException {
-		line();
-	}
-
-	private void writeClass() throws IOException {
-		line();
-		line("public final class "+schema.getName()+" implements MessagePackable, MessageMergeable");
-		line("{");
-		pushIndent();
-			writeSchema();
-			writeMemberVariables();
-			writeMemberFunctions();
-		popIndent();
-		line("}");
-	}
-
-	private void writeSubclass() throws IOException {
-		line();
-		line("final class "+schema.getName()+" implements MessagePackable, MessageMergeable");
-		line("{");
-		pushIndent();
-			writeSchema();
-			writeMemberVariables();
-			writeMemberFunctions();
-		popIndent();
-		line("}");
-	}
-
-	private void writeSchema() throws IOException {
-		line("private static final ClassSchema _SCHEMA = (ClassSchema)Schema.load(\""+schema.getExpression()+"\");");
-		line("public static ClassSchema getSchema() { return _SCHEMA; }");
-	}
-
-	private void writeMemberVariables() throws IOException {
-		line();
-		for(FieldSchema f : schema.getFields()) {
-			line("public "+f.getSchema().getFullName()+" "+f.getName()+";");
-		}
-	}
-
-	private void writeMemberFunctions() throws IOException {
-		// void messagePack(Packer pk)
-		// boolean equals(Object obj)
-		// int hashCode()
-		// void set(int _index, Object _value)
-		// Object get(int _index);
-		// getXxx()
-		// setXxx(Xxx xxx)
-		writeConstructors();
-		writeAccessors();
-		writePackFunction();
-		writeMergeFunction();
-		writeFactoryFunction();
-	}
-
-	private void writeConstructors() throws IOException {
-		line();
-		line("public "+schema.getName()+"() { }");
-	}
-
-	private void writeAccessors() throws IOException {
-		// FIXME
-		//line();
-		//for(FieldSchema f : schema.getFields()) {
-		//	line("");
-		//}
-	}
-
-	private void writePackFunction() throws IOException {
-		line();
-		line("@Override");
-		line("public void messagePack(Packer _pk) throws IOException");
-		line("{");
-		pushIndent();
-			line("_pk.packArray("+schema.getFields().length+");");
-			line("FieldSchema[] _fields = _SCHEMA.getFields();");
-			int i = 0;
-			for(FieldSchema f : schema.getFields()) {
-				line("_fields["+i+"].getSchema().pack(_pk, "+f.getName()+");");
-				++i;
-			}
-		popIndent();
-		line("}");
-	}
-
-	private void writeMergeFunction() throws IOException {
-		line();
-		line("@Override");
-		line("@SuppressWarnings(\"unchecked\")");
-		line("public void messageMerge(Object obj) throws MessageTypeException");
-		line("{");
-		pushIndent();
-			line("Object[] _source = ((List)obj).toArray();");
-			line("FieldSchema[] _fields = _SCHEMA.getFields();");
-			int i = 0;
-			for(FieldSchema f : schema.getFields()) {
-				line("if(_source.length <= "+i+") { return; } this."+f.getName()+" = ("+f.getSchema().getFullName()+")_fields["+i+"].getSchema().convert(_source["+i+"]);");
-				++i;
-			}
-		popIndent();
-		line("}");
-	}
-
-	private void writeFactoryFunction() throws IOException {
-		line();
-		line("@SuppressWarnings(\"unchecked\")");
-		line("public static "+schema.getName()+" createFromMessage(Object[] _message)");
-		line("{");
-		pushIndent();
-			line(schema.getName()+" _self = new "+schema.getName()+"();");
-			int i = 0;
-			for(FieldSchema f : schema.getFields()) {
-				line("if(_message.length <= "+i+") { return _self; } _self."+f.getName()+" = ("+f.getSchema().getFullName()+")_message["+i+"];");
-				++i;
-			}
-			line("return _self;");
-		popIndent();
-		line("}");
-	}
-
-	private void line(String str) throws IOException {
-		for(int i=0; i < indent; ++i) {
-			writer.write("\t");
-		}
-		writer.write(str+"\n");
-	}
-
-	private void line() throws IOException {
-		writer.write("\n");
-	}
-
-	private void pushIndent() {
-		indent += 1;
-	}
-
-	private void popIndent() {
-		indent -= 1;
-	}
-}
-

java/src/main/java/org/msgpack/schema/ClassSchema.java

@@ -1,95 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.util.Arrays;
-import java.util.List;
-import org.msgpack.*;
-
-public abstract class ClassSchema extends Schema implements IArraySchema {
-	protected FieldSchema[] fields;
-	protected List<String> imports;
-	protected String namespace;
-	protected String fqdn;
-
-	public ClassSchema(
-			String name, String namespace,
-			List<String> imports, List<FieldSchema> fields) {
-		super(name);
-		this.namespace = namespace;
-		this.imports = imports;  // FIXME clone?
-		this.fields = new FieldSchema[fields.size()];
-		System.arraycopy(fields.toArray(), 0, this.fields, 0, fields.size());
-		if(namespace == null) {
-			this.fqdn = name;
-		} else {
-			this.fqdn = namespace+"."+name;
-		}
-	}
-
-	public final FieldSchema[] getFields() {
-		return fields;
-	}
-
-	String getNamespace() {
-		return namespace;
-	}
-
-	List<String> getImports() {
-		return imports;
-	}
-
-	void setNamespace(String namespace) {
-		this.namespace = namespace;
-	}
-
-	void setImports(List<String> imports) {
-		this.imports = imports;  // FIXME clone?
-	}
-
-	//@Override
-	//public String getFullName()
-	//{
-	//	if(namespace == null) {
-	//		return getName();
-	//	} else {
-	//		return namespace+"."+getName();
-	//	}
-	//}
-
-	@Override
-	public String getExpression() {
-		StringBuffer b = new StringBuffer();
-		b.append("(class ");
-		b.append(getName());
-		if(namespace != null) {
-			b.append(" (package "+namespace+")");
-		}
-		for(FieldSchema f : fields) {
-			b.append(" "+f.getExpression());
-		}
-		b.append(")");
-		return b.toString();
-	}
-
-	public boolean equals(SpecificClassSchema o) {
-		return (namespace != null ? namespace.equals(o.getNamespace()) : o.getNamespace() == null) &&
-			getName().equals(o.getName());
-	}
-}
-

java/src/main/java/org/msgpack/schema/DoubleSchema.java

@@ -1,84 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.io.IOException;
-import org.msgpack.*;
-
-public class DoubleSchema extends Schema {
-	public DoubleSchema() {
-		super("Double");
-	}
-
-	@Override
-	public String getExpression() {
-		return "double";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj instanceof Number) {
-			pk.packDouble( ((Number)obj).doubleValue() );
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Double) {
-			return obj;
-
-		} else if(obj instanceof Number) {
-			return ((Number)obj).doubleValue();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object createFromByte(byte v) {
-		return (double)v;
-	}
-
-	@Override
-	public Object createFromShort(short v) {
-		return (double)v;
-	}
-
-	@Override
-	public Object createFromInt(int v) {
-		return (double)v;
-	}
-
-	@Override
-	public Object createFromFloat(float v) {
-		return (double)v;
-	}
-
-	@Override
-	public Object createFromDouble(double v) {
-		return (double)v;
-	}
-}
-

java/src/main/java/org/msgpack/schema/FieldSchema.java

@@ -1,43 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import org.msgpack.Schema;
-
-public class FieldSchema {
-	private String name;
-	private Schema schema;
-
-	public FieldSchema(String name, Schema schema) {
-		this.name = name;
-		this.schema = schema;
-	}
-
-	public final String getName() {
-		return name;
-	}
-
-	public final Schema getSchema() {
-		return schema;
-	}
-
-	public String getExpression() {
-		return "(field "+name+" "+schema.getExpression()+")";
-	}
-}
-

java/src/main/java/org/msgpack/schema/FloatSchema.java

@@ -1,84 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.io.IOException;
-import org.msgpack.*;
-
-public class FloatSchema extends Schema {
-	public FloatSchema() {
-		super("Float");
-	}
-
-	@Override
-	public String getExpression() {
-		return "float";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj instanceof Number) {
-			pk.packFloat( ((Number)obj).floatValue() );
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Float) {
-			return obj;
-
-		} else if(obj instanceof Number) {
-			return ((Number)obj).floatValue();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object createFromByte(byte v) {
-		return (float)v;
-	}
-
-	@Override
-	public Object createFromShort(short v) {
-		return (float)v;
-	}
-
-	@Override
-	public Object createFromInt(int v) {
-		return (float)v;
-	}
-
-	@Override
-	public Object createFromFloat(float v) {
-		return (float)v;
-	}
-
-	@Override
-	public Object createFromDouble(double v) {
-		return (float)v;
-	}
-}
-

java/src/main/java/org/msgpack/schema/GenericClassSchema.java

@@ -1,91 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
-import org.msgpack.*;
-
-public class GenericClassSchema extends ClassSchema {
-	public GenericClassSchema(
-			String name, String namespace,
-			List<String> imports, List<FieldSchema> fields) {
-		super(name, namespace, imports, fields);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj instanceof Map) {
-			Map d = (Map)obj;
-			pk.packArray(fields.length);
-			for(int i=0; i < fields.length; ++i) {
-				FieldSchema f = fields[i];
-				f.getSchema().pack(pk, d.get(f.getName()));
-			}
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Collection) {
-			// FIXME optimize
-			return createFromArray( ((Collection)obj).toArray() );
-
-		} else if(obj instanceof Map) {
-			HashMap<String,Object> m = new HashMap<String,Object>(fields.length);
-			Map d = (Map)obj;
-			for(int i=0; i < fields.length; ++i) {
-				FieldSchema f = fields[i];
-				String fieldName = f.getName();
-				m.put(fieldName, f.getSchema().convert(d.get(fieldName)));
-			}
-			return m;
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	public Schema getElementSchema(int index) {
-		// FIXME check index < fields.length
-		return fields[index].getSchema();
-	}
-
-	public Object createFromArray(Object[] obj) {
-		HashMap<String,Object> m = new HashMap<String,Object>(fields.length);
-		int i=0;
-		for(; i < obj.length; ++i) {
-			m.put(fields[i].getName(), obj[i]);
-		}
-		for(; i < fields.length; ++i) {
-			m.put(fields[i].getName(), null);
-		}
-		return m;
-	}
-}
-

java/src/main/java/org/msgpack/schema/GenericSchema.java

@@ -1,192 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.HashMap;
-import java.io.IOException;
-import org.msgpack.*;
-//import org.msgpack.generic.*;
-
-public class GenericSchema extends Schema implements IArraySchema, IMapSchema {
-	public GenericSchema() {
-		super("Object");
-	}
-
-	@Override
-	public String getExpression() {
-		return "object";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		pk.pack(obj);
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		return obj;
-	}
-
-	@Override
-	public Schema getElementSchema(int index) {
-		return this;
-	}
-
-	@Override
-	public Schema getKeySchema() {
-		return this;
-	}
-
-	@Override
-	public Schema getValueSchema() {
-		return this;
-	}
-
-	@Override
-	public Object createFromNil() {
-		return null;
-	}
-
-	@Override
-	public Object createFromBoolean(boolean v) {
-		return v;
-	}
-
-	@Override
-	public Object createFromByte(byte v) {
-		return v;
-	}
-
-	@Override
-	public Object createFromShort(short v) {
-		return v;
-	}
-
-	@Override
-	public Object createFromInt(int v) {
-		return v;
-	}
-
-	@Override
-	public Object createFromLong(long v) {
-		return v;
-	}
-
-	@Override
-	public Object createFromFloat(float v) {
-		return v;
-	}
-
-	@Override
-	public Object createFromDouble(double v) {
-		return v;
-	}
-
-	@Override
-	public Object createFromRaw(byte[] b, int offset, int length) {
-		byte[] bytes = new byte[length];
-		System.arraycopy(b, offset, bytes, 0, length);
-		return bytes;
-	}
-
-	@Override
-	public Object createFromArray(Object[] obj) {
-		return Arrays.asList(obj);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Object createFromMap(Object[] obj) {
-		HashMap m = new HashMap(obj.length / 2);
-		int i = 0;
-		while(i < obj.length) {
-			Object k = obj[i++];
-			Object v = obj[i++];
-			m.put(k, v);
-		}
-		return m;
-	}
-
-	/*
-   @Override
-	public Object createFromNil() {
-		return null;
-	}
-
-	@Override
-	public Object createFromBoolean(boolean v) {
-		return new GenericBoolean(v);
-	}
-
-	@Override
-	public Object createFromFromByte(byte v) {
-		return new GenericByte(v);
-	}
-
-	@Override
-	public Object createFromShort(short v) {
-		return new GenericShort(v);
-	}
-
-	@Override
-	public Object createFromInt(int v) {
-		return new GenericInt(v);
-	}
-
-	@Override
-	public Object createFromLong(long v) {
-		return new GenericLong(v);
-	}
-
-	@Override
-	public Object createFromFloat(float v) {
-		return new GenericFloat(v);
-	}
-
-	@Override
-	public Object createFromDouble(double v) {
-		return new GenericDouble(v);
-	}
-
-	@Override
-	public Object createFromRaw(byte[] b, int offset, int length) {
-		return new GenericRaw(b, offset, length);
-	}
-
-	@Override
-	public Object createFromArray(Object[] obj) {
-		// FIXME GenericArray
-		return Arrays.asList(obj);
-	}
-
-	@Override
-	public Object createFromMap(Object[] obj) {
-		GenericMap m = new GenericMap(obj.length / 2);
-		int i = 0;
-		while(i < obj.length) {
-			Object k = obj[i++];
-			Object v = obj[i++];
-			m.put(k, v);
-		}
-		return m;
-	}
-	*/
-}
-

java/src/main/java/org/msgpack/schema/IArraySchema.java

@@ -1,26 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import org.msgpack.Schema;
-
-public interface IArraySchema {
-	public Schema getElementSchema(int index);
-	public Object createFromArray(Object[] obj);
-}
-

java/src/main/java/org/msgpack/schema/IMapSchema.java

@@ -1,27 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import org.msgpack.Schema;
-
-public interface IMapSchema {
-	public Schema getKeySchema();
-	public Schema getValueSchema();
-	public Object createFromMap(Object[] obj);
-}
-

java/src/main/java/org/msgpack/schema/IntSchema.java

@@ -1,89 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.io.IOException;
-import org.msgpack.*;
-
-public class IntSchema extends Schema {
-	public IntSchema() {
-		super("Integer");
-	}
-
-	@Override
-	public String getExpression() {
-		return "int";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj instanceof Number) {
-			pk.packInt( ((Number)obj).intValue() );
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Integer) {
-			return obj;
-
-		} else if(obj instanceof Number) {
-			return ((Number)obj).intValue();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object createFromByte(byte v) {
-		return (int)v;
-	}
-
-	@Override
-	public Object createFromShort(short v) {
-		return (int)v;
-	}
-
-	@Override
-	public Object createFromInt(int v) {
-		return (int)v;
-	}
-
-	@Override
-	public Object createFromLong(long v) {
-		return (int)v;
-	}
-
-	@Override
-	public Object createFromFloat(float v) {
-		return (int)v;
-	}
-
-	@Override
-	public Object createFromDouble(double v) {
-		return (int)v;
-	}
-}
-

java/src/main/java/org/msgpack/schema/LongSchema.java

@@ -1,89 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.io.IOException;
-import org.msgpack.*;
-
-public class LongSchema extends Schema {
-	public LongSchema() {
-		super("Long");
-	}
-
-	@Override
-	public String getExpression() {
-		return "long";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj instanceof Number) {
-			pk.packLong( ((Number)obj).longValue() );
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Long) {
-			return obj;
-
-		} else if(obj instanceof Number) {
-			return ((Number)obj).longValue();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object createFromByte(byte v) {
-		return (long)v;
-	}
-
-	@Override
-	public Object createFromShort(short v) {
-		return (long)v;
-	}
-
-	@Override
-	public Object createFromInt(int v) {
-		return (long)v;
-	}
-
-	@Override
-	public Object createFromLong(long v) {
-		return (long)v;
-	}
-
-	@Override
-	public Object createFromFloat(float v) {
-		return (long)v;
-	}
-
-	@Override
-	public Object createFromDouble(double v) {
-		return (long)v;
-	}
-}
-

java/src/main/java/org/msgpack/schema/MapSchema.java

@@ -1,103 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
-import org.msgpack.*;
-
-public class MapSchema extends Schema implements IMapSchema {
-	private Schema keySchema;
-	private Schema valueSchema;
-
-	public MapSchema(Schema keySchema, Schema valueSchema) {
-		super("map");
-		this.keySchema = keySchema;
-		this.valueSchema = valueSchema;
-	}
-
-	@Override
-	public String getFullName() {
-		return "HashList<"+keySchema.getFullName()+", "+valueSchema.getFullName()+">";
-	}
-
-	@Override
-	public String getExpression() {
-		return "(map "+keySchema.getExpression()+" "+valueSchema.getExpression()+")";
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj instanceof Map) {
-			Map<Object,Object> d = (Map<Object,Object>)obj;
-			pk.packMap(d.size());
-			for(Map.Entry<Object,Object> e : d.entrySet()) {
-				keySchema.pack(pk, e.getKey());
-				valueSchema.pack(pk, e.getValue());
-			}
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Map) {
-			Map<Object,Object> d = (Map<Object,Object>)obj;
-			Map<Object,Object> m = new HashMap<Object,Object>();
-			for(Map.Entry<Object,Object> e : d.entrySet()) {
-				m.put(keySchema.convert(e.getKey()), valueSchema.convert(e.getValue()));
-			}
-			return m;
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Schema getKeySchema() {
-		return keySchema;
-	}
-
-	@Override
-	public Schema getValueSchema() {
-		return valueSchema;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Object createFromMap(Object[] obj) {
-		HashMap m = new HashMap(obj.length / 2);
-		int i = 0;
-		while(i < obj.length) {
-			Object k = obj[i++];
-			Object v = obj[i++];
-			m.put(k, v);
-		}
-		return m;
-	}
-}
-

java/src/main/java/org/msgpack/schema/RawSchema.java

@@ -1,105 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.nio.ByteBuffer;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import org.msgpack.*;
-
-public class RawSchema extends Schema {
-	public RawSchema() {
-		super("raw");
-	}
-
-	public String getFullName() {
-		return "byte[]";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		// FIXME instanceof GenericObject
-		if(obj instanceof byte[]) {
-			byte[] d = (byte[])obj;
-			pk.packRaw(d.length);
-			pk.packRawBody(d);
-
-		} else if(obj instanceof ByteBuffer) {
-			ByteBuffer d = (ByteBuffer)obj;
-			if(!d.hasArray()) {
-				throw MessageTypeException.invalidConvert(obj, this);
-			}
-			pk.packRaw(d.capacity());
-			pk.packRawBody(d.array(), d.position(), d.capacity());
-
-		} else if(obj instanceof String) {
-			try {
-				byte[] d = ((String)obj).getBytes("UTF-8");
-				pk.packRaw(d.length);
-				pk.packRawBody(d);
-			} catch (UnsupportedEncodingException e) {
-				throw MessageTypeException.invalidConvert(obj, this);
-			}
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		// FIXME instanceof GenericObject
-		if(obj instanceof byte[]) {
-			// FIXME copy?
-			//byte[] d = (byte[])obj;
-			//byte[] v = new byte[d.length];
-			//System.arraycopy(d, 0, v, 0, d.length);
-			//return v;
-			return obj;
-
-		} else if(obj instanceof ByteBuffer) {
-			ByteBuffer d = (ByteBuffer)obj;
-			byte[] v = new byte[d.capacity()];
-			int pos = d.position();
-			d.get(v);
-			d.position(pos);
-			return v;
-
-		} else if(obj instanceof String) {
-			try {
-				return ((String)obj).getBytes("UTF-8");
-			} catch (UnsupportedEncodingException e) {
-				throw MessageTypeException.invalidConvert(obj, this);
-			}
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object createFromRaw(byte[] b, int offset, int length) {
-		byte[] d = new byte[length];
-		System.arraycopy(b, offset, d, 0, length);
-		return d;
-	}
-}
-

java/src/main/java/org/msgpack/schema/ReflectionClassSchema.java

@@ -1,64 +0,0 @@
-package org.msgpack.schema;
-
-import java.util.Arrays;
-import java.util.List;
-import java.lang.reflect.*;
-import org.msgpack.*;
-
-// FIXME
-public abstract class ReflectionClassSchema extends ClassSchema {
-	private Constructor constructorCache;
-
-	public ReflectionClassSchema(String name, List<FieldSchema> fields, String namespace, List<String> imports) {
-		super(name, namespace, imports, fields);
-	}
-
-	/*
-	Schema getElementSchema(int index)
-	{
-		// FIXME check index < fields.length
-		fields[index].getSchema();
-	}
-
-	Object createFromArray(Object[] obj)
-	{
-		Object o = newInstance();
-		((MessageConvertable)o).messageConvert(obj);
-		return o;
-	}
-
-	Object newInstance()
-	{
-		if(constructorCache == null) {
-			cacheConstructor();
-		}
-		try {
-			return constructorCache.newInstance((Object[])null);
-		} catch (InvocationTargetException e) {
-			throw new RuntimeException("can't instantiate "+fqdn+": "+e.getMessage());
-		} catch (InstantiationException e) {
-			throw new RuntimeException("can't instantiate "+fqdn+": "+e.getMessage());
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException("can't instantiate "+fqdn+": "+e.getMessage());
-		}
-	}
-
-	private void cacheConstructor()
-	{
-		try {
-			Class c = Class.forName(fqdn);
-			int index = 0;
-			for(SpecificFieldSchema f : fields) {
-				f.cacheField(c, index++);
-			}
-			constructorCache = c.getDeclaredConstructor((Class[])null);
-			constructorCache.setAccessible(true);
-		} catch(ClassNotFoundException e) {
-			throw new RuntimeException("class not found: "+fqdn);
-		} catch (NoSuchMethodException e) {
-			throw new RuntimeException("class not found: "+fqdn+": "+e.getMessage());
-		}
-	}
-	*/
-}
-

java/src/main/java/org/msgpack/schema/SSchemaParser.java

@@ -1,254 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import org.msgpack.*;
-
-// FIXME exception class
-
-public class SSchemaParser {
-	public static Schema parse(String source) {
-		return new SSchemaParser(false).run(source);
-	}
-
-	public static Schema load(String source) {
-		return new SSchemaParser(true).run(source);
-	}
-
-	private static abstract class SExp {
-		boolean isAtom() { return false; }
-		public String getAtom() { return null; }
-
-		boolean isTuple() { return false; }
-		public SExp getTuple(int i) { return null; }
-		public int size() { return 0; }
-		public boolean empty() { return size() == 0; }
-		Iterator<SExp> iterator(int offset) { return null; }
-	}
-
-	private static class SAtom extends SExp {
-		private String atom;
-
-		SAtom(String atom) { this.atom = atom; }
-
-		boolean isAtom() { return true; }
-		public String getAtom() { return atom; }
-
-		public String toString() { return atom; }
-	}
-
-	private static class STuple extends SExp {
-		private List<SExp> tuple;
-
-		STuple() { this.tuple = new ArrayList<SExp>(); }
-
-		public void add(SExp e) { tuple.add(e); }
-
-		boolean isTuple() { return true; }
-		public SExp getTuple(int i) { return tuple.get(i); }
-		public int size() { return tuple.size(); }
-
-		Iterator<SExp> iterator(int skip) {
-			Iterator<SExp> i = tuple.iterator();
-			for(int s=0; s < skip; ++s) { i.next(); }
-			return i;
-		}
-
-		public String toString() {
-			if(tuple.isEmpty()) { return "()"; }
-			Iterator<SExp> i = tuple.iterator();
-			StringBuffer o = new StringBuffer();
-			o.append("(").append(i.next());
-			while(i.hasNext()) { o.append(" ").append(i.next()); }
-			o.append(")");
-			return o.toString();
-		}
-	}
-
-	boolean specificClass;
-
-	private SSchemaParser(boolean specificClass) {
-		this.specificClass = specificClass;
-	}
-
-	private static Pattern pattern = Pattern.compile(
-			"(?:\\s+)|([\\(\\)]|[\\d\\w\\.]+)");
-
-	private Schema run(String source) {
-		Matcher m = pattern.matcher(source);
-
-		Stack<STuple> stack = new Stack<STuple>();
-		String token;
-
-		while(true) {
-			while(true) {
-				if(!m.find()) { throw new RuntimeException("unexpected end of file"); }
-				token = m.group(1);
-				if(token != null) { break; }
-			}
-
-			if(token.equals("(")) {
-				stack.push(new STuple());
-			} else if(token.equals(")")) {
-				STuple top = stack.pop();
-				if(stack.empty()) {
-					stack.push(top);
-					break;
-				}
-				stack.peek().add(top);
-			} else {
-				if(stack.empty()) {
-					throw new RuntimeException("unexpected token '"+token+"'");
-				}
-				stack.peek().add(new SAtom(token));
-			}
-		}
-
-		while(true) {
-			if(!m.find()) { break; }
-			token = m.group(1);
-			if(token != null) { throw new RuntimeException("unexpected token '"+token+"'"); }
-		}
-
-		return readType( stack.pop() );
-	}
-
-	private Schema readType(SExp exp) {
-		if(exp.isAtom()) {
-			String type = exp.getAtom();
-			if(type.equals("string")) {
-				return new StringSchema();
-			} else if(type.equals("raw")) {
-				return new RawSchema();
-			} else if(type.equals("byte")) {
-				return new ByteSchema();
-			} else if(type.equals("short")) {
-				return new ShortSchema();
-			} else if(type.equals("int")) {
-				return new IntSchema();
-			} else if(type.equals("long")) {
-				return new LongSchema();
-			} else if(type.equals("float")) {
-				return new FloatSchema();
-			} else if(type.equals("double")) {
-				return new DoubleSchema();
-			} else if(type.equals("object")) {
-				return new GenericSchema();
-			} else {
-				throw new RuntimeException("byte, short, int, long, float, double, raw, string or object is expected but got '"+type+"': "+exp);
-			}
-		} else {
-			String type = exp.getTuple(0).getAtom();
-			if(type.equals("class")) {
-				return parseClass(exp);
-			} else if(type.equals("array")) {
-				return parseArray(exp);
-			} else if(type.equals("map")) {
-				return parseMap(exp);
-			} else {
-				throw new RuntimeException("class, array or map is expected but got '"+type+"': "+exp);
-			}
-		}
-	}
-
-	private ClassSchema parseClass(SExp exp) {
-		if(exp.size() < 3 || !exp.getTuple(1).isAtom()) {
-			throw new RuntimeException("class is (class NAME CLASS_BODY): "+exp);
-		}
-
-		String namespace = null;
-		List<String> imports = new ArrayList<String>();
-		String name = exp.getTuple(1).getAtom();
-		List<FieldSchema> fields = new ArrayList<FieldSchema>();
-
-		for(Iterator<SExp> i=exp.iterator(2); i.hasNext();) {
-			SExp subexp = i.next();
-			if(!subexp.isTuple() || subexp.empty() || !subexp.getTuple(0).isAtom()) {
-				throw new RuntimeException("field, package or import is expected: "+subexp);
-			}
-			String type = subexp.getTuple(0).getAtom();
-			if(type.equals("field")) {
-				fields.add( parseField(subexp) );
-			} else if(type.equals("package")) {
-				if(namespace != null) {
-					throw new RuntimeException("duplicated package definition: "+subexp);
-				}
-				namespace = parseNamespace(subexp);
-			} else if(type.equals("import")) {
-				imports.add( parseImport(subexp) );
-			} else {
-				throw new RuntimeException("field, package or import is expected but got '"+type+"': "+subexp);
-			}
-		}
-
-		if(specificClass) {
-			return new SpecificClassSchema(name, namespace, imports, fields);
-		} else {
-			return new GenericClassSchema(name, namespace, imports, fields);
-		}
-	}
-
-	private ArraySchema parseArray(SExp exp) {
-		if(exp.size() != 2) {
-			throw new RuntimeException("array is (array ELEMENT_TYPE): "+exp);
-		}
-		Schema elementType = readType(exp.getTuple(1));
-		return new ArraySchema(elementType);
-	}
-
-	private MapSchema parseMap(SExp exp) {
-		if(exp.size() != 3 || !exp.getTuple(1).isAtom()) {
-			throw new RuntimeException("map is (map KEY_TYPE VALUE_TYPE): "+exp);
-		}
-		Schema keyType   = readType(exp.getTuple(1));
-		Schema valueType = readType(exp.getTuple(2));
-		return new MapSchema(keyType, valueType);
-	}
-
-	private String parseNamespace(SExp exp) {
-		if(exp.size() != 2 || !exp.getTuple(1).isAtom()) {
-			throw new RuntimeException("package is (package NAME): "+exp);
-		}
-		String name = exp.getTuple(1).getAtom();
-		return name;
-	}
-
-	private String parseImport(SExp exp) {
-		if(exp.size() != 2 || !exp.getTuple(1).isAtom()) {
-			throw new RuntimeException("import is (import NAME): "+exp);
-		}
-		String name = exp.getTuple(1).getAtom();
-		return name;
-	}
-
-	private FieldSchema parseField(SExp exp) {
-		if(exp.size() != 3 || !exp.getTuple(1).isAtom()) {
-			throw new RuntimeException("field is (field NAME TYPE): "+exp);
-		}
-		String name = exp.getTuple(1).getAtom();
-		Schema type = readType(exp.getTuple(2));
-		return new FieldSchema(name, type);
-	}
-}
-

java/src/main/java/org/msgpack/schema/ShortSchema.java

@@ -1,89 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.io.IOException;
-import org.msgpack.*;
-
-public class ShortSchema extends Schema {
-	public ShortSchema() {
-		super("Short");
-	}
-
-	@Override
-	public String getExpression() {
-		return "short";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj instanceof Number) {
-			pk.packShort( ((Number)obj).shortValue() );
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Short) {
-			return obj;
-
-		} else if(obj instanceof Number) {
-			return ((Number)obj).shortValue();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object createFromByte(byte v) {
-		return (short)v;
-	}
-
-	@Override
-	public Object createFromShort(short v) {
-		return (short)v;
-	}
-
-	@Override
-	public Object createFromInt(int v) {
-		return (short)v;
-	}
-
-	@Override
-	public Object createFromLong(long v) {
-		return (short)v;
-	}
-
-	@Override
-	public Object createFromFloat(float v) {
-		return (short)v;
-	}
-
-	@Override
-	public Object createFromDouble(double v) {
-		return (short)v;
-	}
-}
-

java/src/main/java/org/msgpack/schema/SpecificClassSchema.java

@@ -1,122 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.util.Collection;
-import java.util.List;
-import java.lang.reflect.*;
-import java.io.IOException;
-import org.msgpack.*;
-
-public class SpecificClassSchema extends ClassSchema {
-	private Class classCache;
-	private Method factoryCache;
-	private Constructor constructorCache;
-
-	public SpecificClassSchema(
-			String name, String namespace,
-			List<String> imports, List<FieldSchema> fields) {
-		super(name, namespace, imports, fields);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void pack(Packer pk, Object obj) throws IOException {
-		if(obj == null) {
-			pk.packNil();
-			return;
-		}
-		if(classCache == null) {
-			cacheFactory();
-		}
-		if(classCache.isInstance(obj)) {
-			((MessagePackable)obj).messagePack(pk);
-		} else {
-			// FIXME Map<String,Object>
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		if(obj instanceof Collection) {
-			if(constructorCache == null) {
-				cacheConstructor();
-			}
-			try {
-				MessageMergeable o = (MessageMergeable)constructorCache.newInstance((Object[])null);
-				o.messageMerge(obj);
-				return o;
-			} catch (InvocationTargetException e) {
-				throw new RuntimeException("can't instantiate "+fqdn+": "+e.getMessage());
-			} catch (InstantiationException e) {
-				throw new RuntimeException("can't instantiate "+fqdn+": "+e.getMessage());
-			} catch (IllegalAccessException e) {
-				throw new RuntimeException("can't instantiate "+fqdn+": "+e.getMessage());
-			}
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	public Schema getElementSchema(int index) {
-		// FIXME check index < fields.length
-		return fields[index].getSchema();
-	}
-
-	public Object createFromArray(Object[] obj) {
-		if(factoryCache == null) {
-			cacheFactory();
-		}
-		try {
-			return factoryCache.invoke(null, new Object[]{obj});
-		} catch (InvocationTargetException e) {
-			throw new RuntimeException("can't instantiate "+fqdn+": "+e.getCause());
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException("can't instantiate "+fqdn+": "+e.getMessage());
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private void cacheFactory() {
-		try {
-			classCache = Class.forName(fqdn);
-			factoryCache = classCache.getDeclaredMethod("createFromMessage", new Class[]{Object[].class});
-			factoryCache.setAccessible(true);
-		} catch(ClassNotFoundException e) {
-			throw new RuntimeException("class not found: "+fqdn);
-		} catch (NoSuchMethodException e) {
-			throw new RuntimeException("class not found: "+fqdn+": "+e.getMessage());
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private void cacheConstructor() {
-		try {
-			classCache = Class.forName(fqdn);
-			constructorCache = classCache.getDeclaredConstructor((Class[])null);
-			constructorCache.setAccessible(true);
-		} catch(ClassNotFoundException e) {
-			throw new RuntimeException("class not found: "+fqdn);
-		} catch (NoSuchMethodException e) {
-			throw new RuntimeException("class not found: "+fqdn+": "+e.getMessage());
-		}
-	}
-}
-

java/src/main/java/org/msgpack/schema/StringSchema.java

@@ -1,111 +0,0 @@
-//
-// MessagePack for Java
-//
-// Copyright (C) 2009-2010 FURUHASHI Sadayuki
-//
-//    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.
-//
-package org.msgpack.schema;
-
-import java.nio.ByteBuffer;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import org.msgpack.*;
-
-public class StringSchema extends Schema {
-	public StringSchema() {
-		super("string");
-	}
-
-	@Override
-	public String getFullName() {
-		return "String";
-	}
-
-	@Override
-	public void pack(Packer pk, Object obj) throws IOException {
-		// FIXME instanceof GenericObject
-		if(obj instanceof String) {
-			try {
-				byte[] d = ((String)obj).getBytes("UTF-8");
-				pk.packRaw(d.length);
-				pk.packRawBody(d);
-			} catch (UnsupportedEncodingException e) {
-				throw MessageTypeException.invalidConvert(obj, this);
-			}
-
-		} else if(obj instanceof byte[]) {
-			byte[] d = (byte[])obj;
-			pk.packRaw(d.length);
-			pk.packRawBody(d);
-
-		} else if(obj instanceof ByteBuffer) {
-			ByteBuffer d = (ByteBuffer)obj;
-			if(!d.hasArray()) {
-				throw MessageTypeException.invalidConvert(obj, this);
-			}
-			pk.packRaw(d.capacity());
-			pk.packRawBody(d.array(), d.position(), d.capacity());
-
-		} else if(obj == null) {
-			pk.packNil();
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object convert(Object obj) throws MessageTypeException {
-		// FIXME instanceof GenericObject
-		if(obj instanceof String) {
-			return obj;
-
-		} else if(obj instanceof byte[]) {
-			try {
-				return new String((byte[])obj, "UTF-8");
-			} catch (UnsupportedEncodingException e) {
-				throw MessageTypeException.invalidConvert(obj, this);
-			}
-
-		} else if(obj instanceof ByteBuffer) {
-			ByteBuffer d = (ByteBuffer)obj;
-			try {
-				if(d.hasArray()) {
-					return new String(d.array(), d.position(), d.capacity(), "UTF-8");
-				} else {
-					byte[] v = new byte[d.capacity()];
-					int pos = d.position();
-					d.get(v);
-					d.position(pos);
-					return new String(v, "UTF-8");
-				}
-			} catch (UnsupportedEncodingException e) {
-				throw MessageTypeException.invalidConvert(obj, this);
-			}
-
-		} else {
-			throw MessageTypeException.invalidConvert(obj, this);
-		}
-	}
-
-	@Override
-	public Object createFromRaw(byte[] b, int offset, int length) {
-		try {
-			return new String(b, offset, length, "UTF-8");
-		} catch (Exception e) {
-			throw new RuntimeException(e.getMessage());
-		}
-	}
-}
-

java/src/test/java/org/msgpack/TestPackUnpack.java

@@ -1,241 +0,0 @@
-package org.msgpack;
-
-import org.msgpack.*;
-import java.io.*;
-import java.util.*;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class TestPackUnpack {
-    protected Object unpackOne(ByteArrayOutputStream out) {
-        return unpackOne(out, null);
-    }
-    protected Object unpackOne(ByteArrayOutputStream out, Schema schema) {
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-        Unpacker upk = new Unpacker(in);
-        if (schema != null)
-            upk = upk.useSchema(schema);
-        Iterator<Object> it = upk.iterator();
-        assertEquals(true, it.hasNext());
-        Object obj = it.next();
-        assertEquals(false, it.hasNext());
-        return obj;
-    }
-
-    @Test
-    public void testInt() throws Exception {
-        testInt(0);
-        testInt(-1);
-        testInt(1);
-        testInt(Integer.MIN_VALUE);
-        testInt(Integer.MAX_VALUE);
-        Random rand = new Random();
-        for (int i = 0; i < 1000; i++)
-            testInt(rand.nextInt());
-    }
-    public void testInt(int val) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        new Packer(out).pack(val);
-        Object obj = unpackOne(out);
-        if (obj instanceof Byte)
-            assertEquals(val, ((Byte)obj).intValue());
-        else if (obj instanceof Integer)
-            assertEquals(val, ((Integer)obj).intValue());
-        else if (obj instanceof Short)
-            assertEquals(val, ((Short)obj).intValue());
-        else if (obj instanceof Long)
-            assertEquals(val, ((Long)obj).intValue());
-        else {
-            System.out.println("Got unexpected class: " + obj.getClass());
-            assertTrue(false);
-        }
-    }
-
-    @Test
-    public void testFloat() throws Exception {
-        testFloat((float)0.0);
-        testFloat((float)-0.0);
-        testFloat((float)1.0);
-        testFloat((float)-1.0);
-        testFloat((float)Float.MAX_VALUE);
-        testFloat((float)Float.MIN_VALUE);
-        testFloat((float)Float.NaN);
-        testFloat((float)Float.NEGATIVE_INFINITY);
-        testFloat((float)Float.POSITIVE_INFINITY);
-        Random rand = new Random();
-        for (int i = 0; i < 1000; i++)
-            testFloat(rand.nextFloat());
-    }
-    public void testFloat(float val) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        new Packer(out).pack(val);
-        Object obj = unpackOne(out);
-        if (obj instanceof Float)
-            assertEquals(val, ((Float)obj).floatValue(), 10e-10);
-        else {
-            System.out.println("Got unexpected class: " + obj.getClass());
-            assertTrue(false);
-        }
-    }
-
-    @Test
-    public void testDouble() throws Exception {
-        testDouble((double)0.0);
-        testDouble((double)-0.0);
-        testDouble((double)1.0);
-        testDouble((double)-1.0);
-        testDouble((double)Double.MAX_VALUE);
-        testDouble((double)Double.MIN_VALUE);
-        testDouble((double)Double.NaN);
-        testDouble((double)Double.NEGATIVE_INFINITY);
-        testDouble((double)Double.POSITIVE_INFINITY);
-        Random rand = new Random();
-        for (int i = 0; i < 1000; i++)
-            testDouble(rand.nextDouble());
-    }
-    public void testDouble(double val) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        new Packer(out).pack(val);
-        Object obj = unpackOne(out);
-        if (obj instanceof Double)
-            assertEquals(val, ((Double)obj).doubleValue(), 10e-10);
-        else {
-            System.out.println("Got unexpected class: " + obj.getClass());
-            assertTrue(false);
-        }
-    }
-
-    @Test
-    public void testNil() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        new Packer(out).packNil();
-        Object obj = unpackOne(out);
-        assertEquals(null, obj);
-    }
-
-    @Test
-    public void testBoolean() throws Exception {
-        testBoolean(false);
-        testBoolean(true);
-    }
-    public void testBoolean(boolean val) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        new Packer(out).pack(val);
-        Object obj = unpackOne(out);
-        if (obj instanceof Boolean)
-            assertEquals(val, ((Boolean)obj).booleanValue());
-        else {
-            System.out.println("Got unexpected class: " + obj.getClass());
-            assertTrue(false);
-        }
-    }
-
-    @Test
-    public void testString() throws Exception {
-        testString("");
-        testString("a");
-        testString("ab");
-        testString("abc");
-        // small size string
-        for (int i = 0; i < 100; i++) {
-            StringBuilder sb = new StringBuilder();
-            int len = (int)Math.random() % 31 + 1;
-            for (int j = 0; j < len; j++)
-                sb.append('a' + ((int)Math.random()) & 26);
-            testString(sb.toString());
-        }
-        // medium size string
-        for (int i = 0; i < 100; i++) {
-            StringBuilder sb = new StringBuilder();
-            int len = (int)Math.random() % 100 + (1 << 15);
-            for (int j = 0; j < len; j++)
-                sb.append('a' + ((int)Math.random()) & 26);
-            testString(sb.toString());
-        }
-        // large size string
-        for (int i = 0; i < 10; i++) {
-            StringBuilder sb = new StringBuilder();
-            int len = (int)Math.random() % 100 + (1 << 31);
-            for (int j = 0; j < len; j++)
-                sb.append('a' + ((int)Math.random()) & 26);
-            testString(sb.toString());
-        }
-    }
-    public void testString(String val) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        new Packer(out).pack(val);
-        Object obj = unpackOne(out);
-        if (obj instanceof byte[])
-            assertEquals(val, new String((byte[])obj));
-        else {
-            System.out.println("obj=" + obj);
-            System.out.println("Got unexpected class: " + obj.getClass());
-            assertTrue(false);
-        }
-    }
-
-    @Test
-    public void testArray() throws Exception {
-        for (int i = 0; i < 1000; i++) {
-            Schema schema = Schema.parse("(array int)");
-            List<Integer> l = new ArrayList<Integer>();
-            int len = (int)Math.random() % 1000 + 1;
-            for (int j = 0; j < len; j++)
-                l.add(j);
-            testArray(l, schema);
-        }
-        for (int i = 0; i < 1000; i++) {
-            Schema schema = Schema.parse("(array string)");
-            List<String> l = new ArrayList<String>();
-            int len = (int)Math.random() % 1000 + 1;
-            for (int j = 0; j < len; j++)
-                l.add(Integer.toString(j));
-            testArray(l, schema);
-        }
-    }
-    public void testArray(List val, Schema schema) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        new Packer(out).pack(val);
-        Object obj = unpackOne(out, schema);
-        if (obj instanceof List)
-            assertTrue(val.equals(obj));
-        else {
-            System.out.println("obj=" + obj);
-            System.out.println("Got unexpected class: " + obj.getClass());
-            assertTrue(false);
-        }
-    }
-
-    @Test
-    public void testMap() throws Exception {
-        for (int i = 0; i < 1000; i++) {
-            Schema schema = Schema.parse("(map int int)");
-            Map<Integer, Integer> m = new HashMap<Integer, Integer>();
-            int len = (int)Math.random() % 1000 + 1;
-            for (int j = 0; j < len; j++)
-                m.put(j, j);
-            testMap(m, schema);
-        }
-        for (int i = 0; i < 1000; i++) {
-            Schema schema = Schema.parse("(map string int)");
-            Map<String, Integer> m = new HashMap<String, Integer>();
-            int len = (int)Math.random() % 1000 + 1;
-            for (int j = 0; j < len; j++)
-                m.put(Integer.toString(j), j);
-            testMap(m, schema);
-        }
-    }
-    public void testMap(Map val, Schema schema) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        new Packer(out).pack(val);
-        Object obj = unpackOne(out, schema);
-        if (obj instanceof Map)
-            assertTrue(val.equals(obj));
-        else {
-            System.out.println("obj=" + obj);
-            System.out.println("Got unexpected class: " + obj.getClass());
-            assertTrue(false);
-        }
-    }    
-};

java/src/test/java/org/msgpack/TestSample.java

@@ -1,11 +0,0 @@
-package org.msgpack;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class TestSample {
-    @Test
-    public void testNull() throws Exception {
-        assertEquals("aiueo", 0, 0);
-    }
-};

java/test/Generate.java

@@ -1,38 +0,0 @@
-import java.io.*;
-import java.util.*;
-import org.msgpack.*;
-import org.msgpack.schema.*;
-
-public class Generate {
-	public static void main(String[] args) throws IOException
-	{
-		String source =
-				"(class MediaContent"+
-				"	(package serializers.msgpack)"+
-				"	(field image (array (class Image"+
-				"			(field uri string)"+
-				"			(field title string)"+
-				"			(field width int)"+
-				"			(field height int)"+
-				"			(field size int))))"+
-				"	(field media (class Media"+
-				"			(field uri string)"+
-				"			(field title string)"+
-				"			(field width int)"+
-				"			(field height int)"+
-				"			(field format string)"+
-				"			(field duration long)"+
-				"			(field size long)"+
-				"			(field bitrate int)"+
-				"			(field person (array string))"+
-				"			(field player int)"+
-				"			(field copyright string)))"+
-				"	)";
-
-		Schema schema = Schema.parse(source);
-
-		Writer output = new OutputStreamWriter(System.out);
-		ClassGenerator.write(schema, output);
-	}
-}
-

java/test/README

@@ -1,7 +0,0 @@
-#!/bin/sh
-svn checkout -r114 http://thrift-protobuf-compare.googlecode.com/svn/trunk/ thrift-protobuf-compare-base
-cp -rf thrift-protobuf-compare/tpc thrift-protobuf-compare-base
-cp ../dist/msgpack.jar thrift-protobuf-compare-base/tpc/lib/
-cd thrift-protobuf-compare-base/tpc/
-ant compile
-./run-benchmark.sh

java/test/thrift-protobuf-compare/tpc/src/serializers/BenchmarkRunner.java

@@ -1,434 +0,0 @@
-package serializers;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import serializers.msgpack.MessagePackSpecificSerializer;
-import serializers.msgpack.MessagePackIndirectSerializer;
-import serializers.msgpack.MessagePackDynamicSerializer;
-import serializers.msgpack.MessagePackGenericSerializer;
-import serializers.avro.AvroGenericSerializer;
-import serializers.avro.specific.AvroSpecificSerializer;
-import serializers.kryo.KryoOptimizedSerializer;
-import serializers.kryo.KryoSerializer;
-
-public class BenchmarkRunner
-{
-  public final static int ITERATIONS = 2000;
-  public final static int TRIALS = 20;
-
-  /**
-   * Number of milliseconds to warm up for each operation type for each serializer. Let's
-   * start with 3 seconds.
-   */
-  final static long WARMUP_MSECS = 3000;
-
-  @SuppressWarnings("unchecked")
-  private Set<ObjectSerializer> _serializers = new LinkedHashSet<ObjectSerializer>();
-
-  public static void main(String... args) throws Exception
-  {
-    BenchmarkRunner runner = new BenchmarkRunner();
-
-    // binary codecs first
-    runner.addObjectSerializer(new MessagePackSpecificSerializer());
-    runner.addObjectSerializer(new MessagePackIndirectSerializer());
-    runner.addObjectSerializer(new MessagePackDynamicSerializer());
-    runner.addObjectSerializer(new MessagePackGenericSerializer());
-    runner.addObjectSerializer(new AvroGenericSerializer());
-    runner.addObjectSerializer(new AvroSpecificSerializer());
-    runner.addObjectSerializer(new ActiveMQProtobufSerializer());
-    runner.addObjectSerializer(new ProtobufSerializer());
-    runner.addObjectSerializer(new ThriftSerializer());
-    runner.addObjectSerializer(new HessianSerializer());
-    runner.addObjectSerializer(new KryoSerializer());
-    runner.addObjectSerializer(new KryoOptimizedSerializer());
-
-    // None of the other serializers use compression, so we'll leave this out.
-    // runner.addObjectSerializer(new KryoCompressedSerializer());
-
-    // then language default serializers
-    runner.addObjectSerializer(new JavaSerializer());
-
-    runner.addObjectSerializer(new JavaExtSerializer());
-    runner.addObjectSerializer(new ScalaSerializer());
-
-    // then Json
-    runner.addObjectSerializer(new JsonSerializer());
-    runner.addObjectSerializer(new JsonDataBindingSerializer());
-    runner.addObjectSerializer(new JsonMarshallerSerializer());
-    runner.addObjectSerializer(new ProtostuffJsonSerializer());
-    runner.addObjectSerializer(new ProtostuffNumericJsonSerializer());
-    // this is pretty slow; so slow that it's almost not worth keeping but:
-    runner.addObjectSerializer(new GsonSerializer());
-
-    // then xml via stax, textual and binary
-    runner.addObjectSerializer(new StaxSerializer("stax/woodstox",
-                                                  new com.ctc.wstx.stax.WstxInputFactory(),
-                                                  new com.ctc.wstx.stax.WstxOutputFactory()));
-    runner.addObjectSerializer(new StaxSerializer("stax/aalto",
-                                                  new com.fasterxml.aalto.stax.InputFactoryImpl(),
-                                                  new com.fasterxml.aalto.stax.OutputFactoryImpl()));
-
-    runner.addObjectSerializer(new StaxSerializer("binaryxml/FI",
-                                                  new com.sun.xml.fastinfoset.stax.factory.StAXInputFactory(),
-                                                  new com.sun.xml.fastinfoset.stax.factory.StAXOutputFactory()));
-
-    // No point in running all 4 variants: let's just use fastest one:
-    //runner.addObjectSerializer(new XStreamSerializer("xstream (xpp)", false, null, null));
-    //runner.addObjectSerializer(new XStreamSerializer("xstream (xpp with conv)", true, null, null));
-    //runner.addObjectSerializer(new XStreamSerializer("xstream (stax)", false, new com.ctc.wstx.stax.WstxInputFactory(), new com.ctc.wstx.stax.WstxOutputFactory()));
-    runner.addObjectSerializer(new XStreamSerializer("xstream (stax with conv)",
-                                                     true,
-                                                     new com.ctc.wstx.stax.WstxInputFactory(),
-                                                     new com.ctc.wstx.stax.WstxOutputFactory()));
-    runner.addObjectSerializer(new JavolutionXMLFormatSerializer());
-
-    runner.addObjectSerializer(new SbinarySerializer());
-    // broken? Does not correctly round-trip:
-    // runner.addObjectSerializer(new YamlSerializer());
-    
-    System.out.println("Starting");
-
-    runner.start();
-  }
-
-  @SuppressWarnings("unchecked")
-  private void addObjectSerializer(ObjectSerializer serializer)
-  {
-    _serializers.add(serializer);
-  }
-
-  private <T> double createObjects(ObjectSerializer<T> serializer, int iterations) throws Exception
-  {
-    long start = System.nanoTime();
-    for (int i = 0; i < iterations; i++)
-    {
-      serializer.create();
-    }
-    return iterationTime(System.nanoTime() - start, iterations);
-  }
-
-  private double iterationTime(long delta, int iterations)
-  {
-    return (double) delta / (double) (iterations);
-  }
-
-  private <T> double serializeDifferentObjects(ObjectSerializer<T> serializer, int iterations) throws Exception
-  {
-    long start = System.nanoTime();
-    for (int i = 0; i < iterations; i++)
-    {
-      T obj = serializer.create();
-      serializer.serialize(obj);
-    }
-    return iterationTime(System.nanoTime()-start, iterations);
-  }
-  
-  
-  private <T> double serializeSameObject(ObjectSerializer<T> serializer, int iterations) throws Exception
-  {
-    // let's reuse same instance to reduce overhead
-    T obj = serializer.create();
-    long delta = 0;
-    for (int i = 0; i < iterations; i++)
-    {
-      long start = System.nanoTime();
-      serializer.serialize(obj);
-      delta += System.nanoTime() - start;
-      if (i % 1000 == 0)
-        doGc();
-    }
-    return iterationTime(delta, iterations);
-  }  
-
-  private <T> double deserializeNoFieldAccess(ObjectSerializer<T> serializer, int iterations) throws Exception
-  {
-    byte[] array = serializer.serialize(serializer.create());
-    long start = System.nanoTime();
-    T result = null;
-    for (int i = 0; i < iterations; i++)
-    {
-      result = serializer.deserialize(array);
-    }
-    return iterationTime(System.nanoTime()-start, iterations);
-  }
-
-  private <T> double deserializeAndCheckAllFields(CheckingObjectSerializer<T> serializer, int iterations) throws Exception
-  {
-    byte[] array = serializer.serialize(serializer.create());
-    long delta = 0;
-    for (int i = 0; i < iterations; i++)
-    {
-      long start = System.nanoTime();
-      T obj = serializer.deserialize(array);
-      serializer.checkAllFields(obj);
-      delta += System.nanoTime() - start;
-    }
-    return iterationTime(delta, iterations);
-  }  
-  
-  private <T> double deserializeAndCheckMediaField(CheckingObjectSerializer<T> serializer, int iterations) throws Exception
-  {
-    byte[] array = serializer.serialize(serializer.create());
-    long delta = 0;
-    for (int i = 0; i < iterations; i++)
-    {
-      long start = System.nanoTime();
-      T obj = serializer.deserialize(array);
-      serializer.checkMediaField(obj);
-      delta += System.nanoTime() - start;
-    }
-    return iterationTime(delta, iterations);
-  }   
-  
-  /**
-   * JVM is not required to honor GC requests, but adding bit of sleep around request is
-   * most likely to give it a chance to do it.
-   */
-  private void doGc()
-  {
-      try {
-          Thread.sleep(50L);
-      } catch (InterruptedException ie) { }
-      System.gc();
-      try { // longer sleep afterwards (not needed by GC, but may help with scheduling)
-          Thread.sleep(200L);
-      } catch (InterruptedException ie) { }
-  }
-
-  enum measurements
-  {
-    timeCreate, timeSerializeDifferentObjects, timeSerializeSameObject, timeDeserializeNoFieldAccess, timeDeserializeAndCheckMediaField, timeDeserializeAndCheckAllFields, totalTime, length
-  }
-
-  @SuppressWarnings("unchecked")
-  private void start() throws Exception
-  {
-    System.out.printf("%-24s, %15s, %15s, %15s, %15s, %15s, %15s, %15s, %10s\n",
-                      " ",
-                      "Object create",
-                      "Serialize",
-                      "/w Same Object",
-                      "Deserialize",
-                      "and Check Media",
-                      "and Check All",
-                      "Total Time",
-                      "Serialized Size");
-    EnumMap<measurements, Map<String, Double>> values = new EnumMap<measurements, Map<String, Double>>(measurements.class);
-    for (measurements m : measurements.values())
-      values.put(m, new HashMap<String, Double>());
-
-    for (ObjectSerializer serializer : _serializers)
-    {
-      /*
-       * Should only warm things for the serializer that we test next: HotSpot JIT will
-       * otherwise spent most of its time optimizing slower ones... Use
-       * -XX:CompileThreshold=1 to hint the JIT to start immediately
-       *
-       * Actually: 1 is often not a good value -- threshold is the number
-       * of samples needed to trigger inlining, and there's no point in
-       * inlining everything. Default value is in thousands, so lowering
-       * it to, say, 1000 is usually better.
-       */
-      warmCreation(serializer);
-      doGc();
-      double timeCreate = Double.MAX_VALUE;
-      // do more iteration for object creation because of its short time
-      for (int i = 0; i < TRIALS; i++)
-        timeCreate = Math.min(timeCreate, createObjects(serializer, ITERATIONS * 100));
-
-      warmSerialization(serializer);
-
-      // actually: let's verify serializer actually works now:
-      checkCorrectness(serializer);
-
-      doGc();
-      double timeSerializeDifferentObjects = Double.MAX_VALUE;
-      for (int i = 0; i < TRIALS; i++)
-        timeSerializeDifferentObjects = Math.min(timeSerializeDifferentObjects, serializeDifferentObjects(serializer, ITERATIONS));
-
-      doGc();
-      double timeSerializeSameObject = Double.MAX_VALUE;
-      for (int i = 0; i < TRIALS; i++)
-          timeSerializeSameObject = Math.min(timeSerializeSameObject, serializeSameObject(serializer, ITERATIONS));
-      
-      warmDeserialization(serializer);
-      
-      doGc();
-      double timeDeserializeNoFieldAccess = Double.MAX_VALUE;
-      for (int i = 0; i < TRIALS; i++)
-        timeDeserializeNoFieldAccess = Math.min(timeDeserializeNoFieldAccess, deserializeNoFieldAccess(serializer, ITERATIONS));
-
-      double timeDeserializeAndCheckAllFields = Double.NaN;
-      double timeDeserializeAndCheckMediaField = Double.NaN;
-
-      double totalTime = timeSerializeDifferentObjects + timeDeserializeNoFieldAccess;
-
-      if( serializer instanceof CheckingObjectSerializer) {
-          CheckingObjectSerializer checkingSerializer = (CheckingObjectSerializer)serializer;
-
-          timeDeserializeAndCheckMediaField = Double.MAX_VALUE;
-          doGc();
-          for (int i = 0; i < TRIALS; i++)
-              timeDeserializeAndCheckMediaField = Math.min(timeDeserializeAndCheckMediaField, deserializeAndCheckMediaField(checkingSerializer, ITERATIONS));
-
-          timeDeserializeAndCheckAllFields = Double.MAX_VALUE;
-          doGc();
-          for (int i = 0; i < TRIALS; i++) 
-              timeDeserializeAndCheckAllFields = Math.min(timeDeserializeAndCheckAllFields, deserializeAndCheckAllFields(checkingSerializer, ITERATIONS));
-
-          totalTime = timeSerializeDifferentObjects + timeDeserializeAndCheckAllFields;
-      }
-      
-      
-      byte[] array = serializer.serialize(serializer.create());
-      System.out.printf("%-24s, %15.5f, %15.5f, %15.5f, %15.5f, %15.5f, %15.5f, %15.5f, %10d\n",
-                        serializer.getName(),
-                        timeCreate,
-                        timeSerializeDifferentObjects,
-                        timeSerializeSameObject,
-                        timeDeserializeNoFieldAccess,
-                        timeDeserializeAndCheckMediaField,
-                        timeDeserializeAndCheckAllFields,
-                        totalTime,
-                        array.length);
-      
-      addValue(values, serializer.getName(), timeCreate, timeSerializeDifferentObjects, timeSerializeSameObject, 
-              timeDeserializeNoFieldAccess, timeDeserializeAndCheckMediaField, timeDeserializeAndCheckAllFields, totalTime, array.length);
-    }
-    printImages(values);
-  }
-
-    /**
-     * Method that tries to validate correctness of serializer, using
-     * round-trip (construct, serializer, deserialize; compare objects
-     * after steps 1 and 3).
-     * Currently only done for StdMediaDeserializer...
-     */
-    private void checkCorrectness(ObjectSerializer serializer)
-        throws Exception
-    {
-        Object input = serializer.create();
-        byte[] array = serializer.serialize(input);
-        Object output = serializer.deserialize(array);
-
-        if (!input.equals(output)) {
-            /* Should throw an exception; but for now (that we have a few
-             * failures) let's just whine...
-             */
-            String msg = "serializer '"+serializer.getName()+"' failed round-trip test (ser+deser produces Object different from input), input="+input+", output="+output;
-            //throw new Exception("Error: "+msg);
-            System.err.println("WARN: "+msg);
-        }
-    }
-
-  private void printImages(EnumMap<measurements, Map<String, Double>> values)
-  {
-    for (measurements m : values.keySet()) {
-     Map<String, Double> map = values.get(m);
-     ArrayList<Entry> list = new ArrayList(map.entrySet());
-     Collections.sort(list, new Comparator<Entry>() {
-            public int compare (Entry o1, Entry o2) {
-                double diff = (Double)o1.getValue() - (Double)o2.getValue();
-                return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
-            }
-     });
-     LinkedHashMap<String, Double> sortedMap = new LinkedHashMap<String, Double>();
-     for (Entry<String, Double> entry : list) {
-         if( !entry.getValue().isNaN() ) {
-             sortedMap.put(entry.getKey(), entry.getValue());
-         }
-     }
-      printImage(sortedMap, m);
-    }
-  }
-
-  private void printImage(Map<String, Double> map, measurements m)
-  {
-    StringBuilder valSb = new StringBuilder();
-    String names = "";
-    double max = Double.MIN_NORMAL;
-    for (Entry<String, Double> entry : map.entrySet())
-    {
-      valSb.append(entry.getValue()).append(',');
-      max = Math.max(max, entry.getValue());
-      names = entry.getKey() + '|' + names;
-    }
-
-    int height = Math.min(30+map.size()*20, 430); 
-    double scale = max * 1.1;
-    System.out.println("<img src='http://chart.apis.google.com/chart?chtt="
-        + m.name()
-        + "&chf=c||lg||0||FFFFFF||1||76A4FB||0|bg||s||EFEFEF&chs=689x"+height+"&chd=t:"
-        + valSb.toString().substring(0, valSb.length() - 1)
-        + "&chds=0,"+ scale
-        + "&chxt=y"
-        + "&chxl=0:|" + names.substring(0, names.length() - 1)
-        + "&chm=N *f*,000000,0,-1,10&lklk&chdlp=t&chco=660000|660033|660066|660099|6600CC|6600FF|663300|663333|663366|663399|6633CC|6633FF|666600|666633|666666&cht=bhg&chbh=10&nonsense=aaa.png'/>");
-
-  }
-
-  private void addValue(EnumMap<measurements, Map<String, Double>> values,
-                        String name,
-                        double timeCreate,
-                        double timeSerializeDifferentObjects,
-                        double timeSerializeSameObject,
-                        double timeDeserializeNoFieldAccess,
-                        double timeDeserializeAndCheckMediaField, 
-                        double timeDeserializeAndCheckAllFields,
-                        double totalTime,
-                        double length)
-  {
-      
-    values.get(measurements.timeCreate).put(name, timeCreate);
-    values.get(measurements.timeSerializeDifferentObjects).put(name, timeSerializeDifferentObjects);
-    values.get(measurements.timeSerializeSameObject).put(name, timeSerializeSameObject);
-    values.get(measurements.timeDeserializeNoFieldAccess).put(name, timeDeserializeNoFieldAccess);
-    values.get(measurements.timeDeserializeAndCheckMediaField).put(name, timeDeserializeAndCheckMediaField);
-    values.get(measurements.timeDeserializeAndCheckAllFields).put(name, timeDeserializeAndCheckAllFields);
-    values.get(measurements.totalTime).put(name, totalTime);
-    values.get(measurements.length).put(name, length);
-  }
-
-  private <T> void warmCreation(ObjectSerializer<T> serializer) throws Exception
-  {
-    // Instead of fixed counts, let's try to prime by running for N seconds
-    long endTime = System.currentTimeMillis() + WARMUP_MSECS;
-    do
-    {
-      createObjects(serializer, 1);
-    }
-    while (System.currentTimeMillis() < endTime);
-  }
-
-  private <T> void warmSerialization(ObjectSerializer<T> serializer) throws Exception
-  {
-    // Instead of fixed counts, let's try to prime by running for N seconds
-    long endTime = System.currentTimeMillis() + WARMUP_MSECS;
-    do
-    {
-      serializeDifferentObjects(serializer, 1);
-    }
-    while (System.currentTimeMillis() < endTime);
-  }
-
-  private <T> void warmDeserialization(ObjectSerializer<T> serializer) throws Exception
-  {
-    // Instead of fixed counts, let's try to prime by running for N seconds
-    long endTime = System.currentTimeMillis() + WARMUP_MSECS;
-    do
-    {
-      deserializeNoFieldAccess(serializer, 1);
-    }
-    while (System.currentTimeMillis() < endTime);
-  }
-}

java/test/thrift-protobuf-compare/tpc/src/serializers/msgpack/MediaContent.java

@@ -1,173 +0,0 @@
-package serializers.msgpack;
-
-import java.util.*;
-import java.io.*;
-import org.msgpack.*;
-import org.msgpack.schema.ClassSchema;
-import org.msgpack.schema.FieldSchema;
-
-public final class MediaContent implements MessagePackable, MessageMergeable
-{
-	private static final ClassSchema _SCHEMA = (ClassSchema)Schema.load("(class MediaContent (package serializers.msgpack) (field image (array (class Image (package serializers.msgpack) (field uri string) (field title string) (field width int) (field height int) (field size int)))) (field media (class Media (package serializers.msgpack) (field uri string) (field title string) (field width int) (field height int) (field format string) (field duration long) (field size long) (field bitrate int) (field person (array string)) (field player int) (field copyright string))))");
-	public static ClassSchema getSchema() { return _SCHEMA; }
-
-	public List<Image> image;
-	public Media media;
-
-	public MediaContent() { }
-
-	@Override
-	public void messagePack(Packer _pk) throws IOException
-	{
-		_pk.packArray(2);
-		FieldSchema[] _fields = _SCHEMA.getFields();
-		_fields[0].getSchema().pack(_pk, image);
-		_fields[1].getSchema().pack(_pk, media);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void messageMerge(Object obj) throws MessageTypeException
-	{
-		Object[] _source = ((List)obj).toArray();
-		FieldSchema[] _fields = _SCHEMA.getFields();
-		if(_source.length <= 0) { return; } this.image = (List<Image>)_fields[0].getSchema().convert(_source[0]);
-		if(_source.length <= 1) { return; } this.media = (Media)_fields[1].getSchema().convert(_source[1]);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static MediaContent createFromMessage(Object[] _message)
-	{
-		MediaContent _self = new MediaContent();
-		if(_message.length <= 0) { return _self; } _self.image = (List<Image>)_message[0];
-		if(_message.length <= 1) { return _self; } _self.media = (Media)_message[1];
-		return _self;
-	}
-}
-
-final class Image implements MessagePackable, MessageMergeable
-{
-	private static final ClassSchema _SCHEMA = (ClassSchema)Schema.load("(class Image (package serializers.msgpack) (field uri string) (field title string) (field width int) (field height int) (field size int))");
-	public static ClassSchema getSchema() { return _SCHEMA; }
-
-	public String uri;
-	public String title;
-	public Integer width;
-	public Integer height;
-	public Integer size;
-
-	public Image() { }
-
-	@Override
-	public void messagePack(Packer _pk) throws IOException
-	{
-		_pk.packArray(5);
-		FieldSchema[] _fields = _SCHEMA.getFields();
-		_fields[0].getSchema().pack(_pk, uri);
-		_fields[1].getSchema().pack(_pk, title);
-		_fields[2].getSchema().pack(_pk, width);
-		_fields[3].getSchema().pack(_pk, height);
-		_fields[4].getSchema().pack(_pk, size);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void messageMerge(Object obj) throws MessageTypeException
-	{
-		Object[] _source = ((List)obj).toArray();
-		FieldSchema[] _fields = _SCHEMA.getFields();
-		if(_source.length <= 0) { return; } this.uri = (String)_fields[0].getSchema().convert(_source[0]);
-		if(_source.length <= 1) { return; } this.title = (String)_fields[1].getSchema().convert(_source[1]);
-		if(_source.length <= 2) { return; } this.width = (Integer)_fields[2].getSchema().convert(_source[2]);
-		if(_source.length <= 3) { return; } this.height = (Integer)_fields[3].getSchema().convert(_source[3]);
-		if(_source.length <= 4) { return; } this.size = (Integer)_fields[4].getSchema().convert(_source[4]);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static Image createFromMessage(Object[] _message)
-	{
-		Image _self = new Image();
-		if(_message.length <= 0) { return _self; } _self.uri = (String)_message[0];
-		if(_message.length <= 1) { return _self; } _self.title = (String)_message[1];
-		if(_message.length <= 2) { return _self; } _self.width = (Integer)_message[2];
-		if(_message.length <= 3) { return _self; } _self.height = (Integer)_message[3];
-		if(_message.length <= 4) { return _self; } _self.size = (Integer)_message[4];
-		return _self;
-	}
-}
-
-final class Media implements MessagePackable, MessageMergeable
-{
-	private static final ClassSchema _SCHEMA = (ClassSchema)Schema.load("(class Media (package serializers.msgpack) (field uri string) (field title string) (field width int) (field height int) (field format string) (field duration long) (field size long) (field bitrate int) (field person (array string)) (field player int) (field copyright string))");
-	public static ClassSchema getSchema() { return _SCHEMA; }
-
-	public String uri;
-	public String title;
-	public Integer width;
-	public Integer height;
-	public String format;
-	public Long duration;
-	public Long size;
-	public Integer bitrate;
-	public List<String> person;
-	public Integer player;
-	public String copyright;
-
-	public Media() { }
-
-	@Override
-	public void messagePack(Packer _pk) throws IOException
-	{
-		_pk.packArray(11);
-		FieldSchema[] _fields = _SCHEMA.getFields();
-		_fields[0].getSchema().pack(_pk, uri);
-		_fields[1].getSchema().pack(_pk, title);
-		_fields[2].getSchema().pack(_pk, width);
-		_fields[3].getSchema().pack(_pk, height);
-		_fields[4].getSchema().pack(_pk, format);
-		_fields[5].getSchema().pack(_pk, duration);
-		_fields[6].getSchema().pack(_pk, size);
-		_fields[7].getSchema().pack(_pk, bitrate);
-		_fields[8].getSchema().pack(_pk, person);
-		_fields[9].getSchema().pack(_pk, player);
-		_fields[10].getSchema().pack(_pk, copyright);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void messageMerge(Object obj) throws MessageTypeException
-	{
-		Object[] _source = ((List)obj).toArray();
-		FieldSchema[] _fields = _SCHEMA.getFields();
-		if(_source.length <= 0) { return; } this.uri = (String)_fields[0].getSchema().convert(_source[0]);
-		if(_source.length <= 1) { return; } this.title = (String)_fields[1].getSchema().convert(_source[1]);
-		if(_source.length <= 2) { return; } this.width = (Integer)_fields[2].getSchema().convert(_source[2]);
-		if(_source.length <= 3) { return; } this.height = (Integer)_fields[3].getSchema().convert(_source[3]);
-		if(_source.length <= 4) { return; } this.format = (String)_fields[4].getSchema().convert(_source[4]);
-		if(_source.length <= 5) { return; } this.duration = (Long)_fields[5].getSchema().convert(_source[5]);
-		if(_source.length <= 6) { return; } this.size = (Long)_fields[6].getSchema().convert(_source[6]);
-		if(_source.length <= 7) { return; } this.bitrate = (Integer)_fields[7].getSchema().convert(_source[7]);
-		if(_source.length <= 8) { return; } this.person = (List<String>)_fields[8].getSchema().convert(_source[8]);
-		if(_source.length <= 9) { return; } this.player = (Integer)_fields[9].getSchema().convert(_source[9]);
-		if(_source.length <= 10) { return; } this.copyright = (String)_fields[10].getSchema().convert(_source[10]);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static Media createFromMessage(Object[] _message)
-	{
-		Media _self = new Media();
-		if(_message.length <= 0) { return _self; } _self.uri = (String)_message[0];
-		if(_message.length <= 1) { return _self; } _self.title = (String)_message[1];
-		if(_message.length <= 2) { return _self; } _self.width = (Integer)_message[2];
-		if(_message.length <= 3) { return _self; } _self.height = (Integer)_message[3];
-		if(_message.length <= 4) { return _self; } _self.format = (String)_message[4];
-		if(_message.length <= 5) { return _self; } _self.duration = (Long)_message[5];
-		if(_message.length <= 6) { return _self; } _self.size = (Long)_message[6];
-		if(_message.length <= 7) { return _self; } _self.bitrate = (Integer)_message[7];
-		if(_message.length <= 8) { return _self; } _self.person = (List<String>)_message[8];
-		if(_message.length <= 9) { return _self; } _self.player = (Integer)_message[9];
-		if(_message.length <= 10) { return _self; } _self.copyright = (String)_message[10];
-		return _self;
-	}
-}
-

java/test/thrift-protobuf-compare/tpc/src/serializers/msgpack/MediaContent.mpacs

@@ -1,21 +0,0 @@
-(class MediaContent
-	(package serializers.msgpack)
-	(field image (array (class Image
-			(field uri string)
-			(field title string)
-			(field width int)
-			(field height int)
-			(field size int))))
-	(field media (class Media
-			(field uri string)
-			(field title string)
-			(field width int)
-			(field height int)
-			(field format string)
-			(field duration long)
-			(field size long)
-			(field bitrate int)
-			(field person (array string))
-			(field player int)
-			(field copyright string)))
-	)

java/test/thrift-protobuf-compare/tpc/src/serializers/msgpack/MessagePackDynamicSerializer.java

@@ -1,68 +0,0 @@
-package serializers.msgpack;
-
-import java.io.*;
-import java.util.*;
-import org.msgpack.*;
-import serializers.ObjectSerializer;
-
-public class MessagePackDynamicSerializer implements ObjectSerializer<Object>
-{
-	public String getName() {
-		return "msgpack-dynamic";
-	}
-
-	public Object create() throws Exception {
-		ArrayList media = new ArrayList(11);
-		media.add("http://javaone.com/keynote.mpg");
-		media.add("video/mpg4");
-		media.add("Javaone Keynote");
-		media.add(1234567L);
-		media.add(0);
-		ArrayList<String> person = new ArrayList<String>(2);
-		person.add("Bill Gates");
-		person.add("Steve Jobs");
-		media.add(person);
-		media.add(0);
-		media.add(0);
-		media.add(0);
-		media.add(123L);
-		media.add("");
-
-		ArrayList image1 = new ArrayList(5);
-		image1.add("http://javaone.com/keynote_large.jpg");
-		image1.add(0);
-		image1.add(0);
-		image1.add(2);
-		image1.add("Javaone Keynote");
-
-		ArrayList image2 = new ArrayList(5);
-		image2.add("http://javaone.com/keynote_thumbnail.jpg");
-		image2.add(0);
-		image2.add(0);
-		image2.add(1);
-		image2.add("Javaone Keynote");
-
-		ArrayList content = new ArrayList(2);
-		content.add(media);
-		ArrayList<Object> images = new ArrayList<Object>(2);
-		images.add(image1);
-		images.add(image2);
-		content.add(images);
-
-		return content;
-	}
-
-	public byte[] serialize(Object content) throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		Packer pk = new Packer(os);
-		pk.pack(content);
-		return os.toByteArray();
-	}
-
-	public Object deserialize(byte[] array) throws Exception {
-		UnbufferedUnpacker pac = new UnbufferedUnpacker();
-		pac.execute(array);
-		return (Object)pac.getData();
-	}
-}
-

java/test/thrift-protobuf-compare/tpc/src/serializers/msgpack/MessagePackGenericSerializer.java

@@ -1,70 +0,0 @@
-package serializers.msgpack;
-
-import java.io.*;
-import java.util.*;
-import org.msgpack.*;
-import serializers.ObjectSerializer;
-
-public class MessagePackGenericSerializer implements ObjectSerializer<Object>
-{
-	private static final Schema MEDIA_CONTENT_SCHEMA = Schema.parse("(class MediaContent (package serializers.msgpack) (field image (array (class Image (package serializers.msgpack) (field uri string) (field title string) (field width int) (field height int) (field size int)))) (field media (class Media (package serializers.msgpack) (field uri string) (field title string) (field width int) (field height int) (field format string) (field duration long) (field size long) (field bitrate int) (field person (array string)) (field player int) (field copyright string))))");
-
-	public String getName() {
-		return "msgpack-generic";
-	}
-
-	public Object create() throws Exception {
-		HashMap<String,Object> media = new HashMap<String, Object>(11);
-		media.put("uri", "http://javaone.com/keynote.mpg");
-		media.put("format", "video/mpg4");
-		media.put("title", "Javaone Keynote");
-		media.put("duration", 1234567L);
-		media.put("bitrate", 0);
-		ArrayList<String> person = new ArrayList<String>(2);
-		person.add("Bill Gates");
-		person.add("Steve Jobs");
-		media.put("person", person);
-		media.put("player", 0);
-		media.put("height", 0);
-		media.put("width", 0);
-		media.put("size", 123L);
-		media.put("copyright", "");
-
-		HashMap<String,Object> image1 = new HashMap<String,Object>(5);
-		image1.put("uri", "http://javaone.com/keynote_large.jpg");
-		image1.put("width", 0);
-		image1.put("height", 0);
-		image1.put("size", 2);
-		image1.put("title", "Javaone Keynote");
-
-		HashMap<String,Object> image2 = new HashMap<String,Object>(5);
-		image2.put("uri", "http://javaone.com/keynote_thumbnail.jpg");
-		image2.put("width", 0);
-		image2.put("height", 0);
-		image2.put("size", 1);
-		image2.put("title", "Javaone Keynote");
-
-		HashMap<String,Object> content = new HashMap<String,Object>(2);
-		content.put("media", media);
-		ArrayList<Object> images = new ArrayList<Object>(2);
-		images.add(image1);
-		images.add(image2);
-		content.put("image", images);
-
-		return content;
-	}
-
-	public byte[] serialize(Object content) throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		Packer pk = new Packer(os);
-		pk.packWithSchema(content, MEDIA_CONTENT_SCHEMA);
-		return os.toByteArray();
-	}
-
-	public Object deserialize(byte[] array) throws Exception {
-		UnbufferedUnpacker pac = new UnbufferedUnpacker().useSchema(MEDIA_CONTENT_SCHEMA);
-		pac.execute(array);
-		return (Object)pac.getData();
-	}
-}
-

java/test/thrift-protobuf-compare/tpc/src/serializers/msgpack/MessagePackIndirectSerializer.java

@@ -1,67 +0,0 @@
-package serializers.msgpack;
-
-import java.io.*;
-import java.util.*;
-import org.msgpack.*;
-import serializers.ObjectSerializer;
-
-public class MessagePackIndirectSerializer implements ObjectSerializer<MediaContent>
-{
-	public String getName() {
-		return "msgpack-indirect";
-	}
-
-	public MediaContent create() throws Exception {
-		Media media = new Media();
-		media.uri = "http://javaone.com/keynote.mpg";
-		media.format = "video/mpg4";
-		media.title = "Javaone Keynote";
-		media.duration = 1234567L;
-		media.bitrate = 0;
-		media.person = new ArrayList<String>(2);
-		media.person.add("Bill Gates");
-		media.person.add("Steve Jobs");
-		media.player = 0;
-		media.height = 0;
-		media.width = 0;
-		media.size = 123L;
-		media.copyright = "";
-
-		Image image1 = new Image();
-		image1.uri = "http://javaone.com/keynote_large.jpg";
-		image1.width = 0;
-		image1.height = 0;
-		image1.size = 2;
-		image1.title = "Javaone Keynote";
-
-		Image image2 = new Image();
-		image2.uri = "http://javaone.com/keynote_thumbnail.jpg";
-		image2.width = 0;
-		image2.height = 0;
-		image2.size = 1;
-		image2.title = "Javaone Keynote";
-
-		MediaContent content = new MediaContent();
-		content.media = media;
-		content.image = new ArrayList<Image>(2);
-		content.image.add(image1);
-		content.image.add(image2);
-
-		return content;
-	}
-
-	public byte[] serialize(MediaContent content) throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		Packer pk = new Packer(os);
-		pk.pack(content);
-		return os.toByteArray();
-	}
-
-	public MediaContent deserialize(byte[] array) throws Exception {
-		UnbufferedUnpacker pac = new UnbufferedUnpacker();
-		pac.execute(array);
-		Object obj = pac.getData();
-		return (MediaContent)MediaContent.getSchema().convert(obj);
-	}
-}
-

java/test/thrift-protobuf-compare/tpc/src/serializers/msgpack/MessagePackSpecificSerializer.java

@@ -1,66 +0,0 @@
-package serializers.msgpack;
-
-import java.io.*;
-import java.util.*;
-import org.msgpack.*;
-import serializers.ObjectSerializer;
-
-public class MessagePackSpecificSerializer implements ObjectSerializer<MediaContent>
-{
-	public String getName() {
-		return "msgpack-specific";
-	}
-
-	public MediaContent create() throws Exception {
-		Media media = new Media();
-		media.uri = "http://javaone.com/keynote.mpg";
-		media.format = "video/mpg4";
-		media.title = "Javaone Keynote";
-		media.duration = 1234567L;
-		media.bitrate = 0;
-		media.person = new ArrayList<String>(2);
-		media.person.add("Bill Gates");
-		media.person.add("Steve Jobs");
-		media.player = 0;
-		media.height = 0;
-		media.width = 0;
-		media.size = 123L;
-		media.copyright = "";
-
-		Image image1 = new Image();
-		image1.uri = "http://javaone.com/keynote_large.jpg";
-		image1.width = 0;
-		image1.height = 0;
-		image1.size = 2;
-		image1.title = "Javaone Keynote";
-
-		Image image2 = new Image();
-		image2.uri = "http://javaone.com/keynote_thumbnail.jpg";
-		image2.width = 0;
-		image2.height = 0;
-		image2.size = 1;
-		image2.title = "Javaone Keynote";
-
-		MediaContent content = new MediaContent();
-		content.media = media;
-		content.image = new ArrayList<Image>(2);
-		content.image.add(image1);
-		content.image.add(image2);
-
-		return content;
-	}
-
-	public byte[] serialize(MediaContent content) throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		Packer pk = new Packer(os);
-		pk.pack(content);
-		return os.toByteArray();
-	}
-
-	public MediaContent deserialize(byte[] array) throws Exception {
-		UnbufferedUnpacker pac = new UnbufferedUnpacker().useSchema(MediaContent.getSchema());
-		pac.execute(array);
-		return (MediaContent)pac.getData();
-	}
-}
-

msgpack.pc.in

@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: MessagePack
+Description: Binary-based efficient object serialization library
+Version: @VERSION@
+Libs: -L${libdir} -lmsgpack
+Cflags: -I${includedir}