optimizses serialization format

Author: shikokuchuo

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: nanonext
 Type: Package
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 0.13.2.9006
+Version: 0.13.2.9007
 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
     a socket library implementing 'Scalability Protocols', a reliable,
     high-performance standard for common communications patterns including

NEWS.md

@@ -1,8 +1,8 @@
-# nanonext 0.13.2.9006 (development)
+# nanonext 0.13.2.9007 (development)
 
 #### New Features
 
-* `next_config()` gains argument 'class' and 'vec', enabling custom serialization to all reference objects supported by R serialization.
+* `next_config()` gains argument 'class' and 'vec', enabling custom serialization for all reference object types supported by R serialization.
 * Upgrades bundled 'libnng' to v1.7.3.
 
 # nanonext 0.13.2

README.Rmd

@@ -159,7 +159,7 @@ As system libraries, 'libnng' is available as libnng-dev (deb) or nng-devel (rpm
 
 For R >= 4.2 using the 'Rtools42' or 'Rtools43' toolchains, 'libnng' v1.7.3 and 'libmbedtls' v3.5.2 will be automatically compiled from the package sources during installation.
 
-For previous R versions, pre-compiled 'libnng' v1.7.2 and 'libmbedtls' v3.5.2 libraries are downloaded and used for installation instead.
+For previous R versions, pre-compiled 'libnng' v1.7.3 and 'libmbedtls' v3.5.2 libraries are downloaded and used for installation instead.
 
 ### Acknowledgements and Links
 

README.md

@@ -207,7 +207,7 @@ For R \>= 4.2 using the ‘Rtools42’ or ‘Rtools43’ toolchains, ‘libnng
 v1.7.3 and ‘libmbedtls’ v3.5.2 will be automatically compiled from the
 package sources during installation.
 
-For previous R versions, pre-compiled ‘libnng’ v1.7.2 and ‘libmbedtls’
+For previous R versions, pre-compiled ‘libnng’ v1.7.3 and ‘libmbedtls’
 v3.5.2 libraries are downloaded and used for installation instead.
 
 ### Acknowledgements and Links

src/Makevars.win

@@ -4,12 +4,12 @@ else
     ARC="i386"
 endif
 
-PKG_CFLAGS=-I../src-${ARC}/rwinlib-1.7.2_3.5.2/include -DNNG_STATIC_LIB $(C_VISIBILITY)
-PKG_LIBS=-L../src-${ARC}/rwinlib-1.7.2_3.5.2/lib${R_ARCH} -lnng -lmbedtls -lmbedx509 -lmbedcrypto -lbcrypt -lws2_32
+PKG_CFLAGS=-I../src-${ARC}/rwinlib-1.7.3_3.5.2/include -DNNG_STATIC_LIB $(C_VISIBILITY)
+PKG_LIBS=-L../src-${ARC}/rwinlib-1.7.3_3.5.2/lib${R_ARCH} -lnng -lmbedtls -lmbedx509 -lmbedcrypto -lbcrypt -lws2_32
 
 all: winlibs
 
 winlibs:
-	curl -sL https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.7.2_3.5.2.zip -o nng.zip
+	curl -sL https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.7.3_3.5.2.zip -o nng.zip
 	unzip -q nng.zip
 	rm -f nng.zip

src/core.c

@@ -212,7 +212,7 @@ void nano_serialize_next(nano_buf *buf, const SEXP object) {
   buf->buf[0] = 0x7;
   buf->buf[1] = registered;
   buf->buf[2] = special_bit;
-  buf->cur += registered ? 16 : 8;
+  buf->cur += registered ? 16 : 4;
 
   struct R_outpstream_st output_stream;
 
@@ -366,7 +366,7 @@ SEXP nano_unserialize(unsigned char *buf, const size_t sz) {
         goto resume;
       }
       offset = 0;
-      cur = 8;
+      cur = 4;
       goto resume;
     }
   }