Merge 1d2a75d into 7fd530f

tarantool · Apr 21, 2024 · 94544d4 · 94544d4
2 parents 7fd530f + 1d2a75d
commit 94544d4
Show file tree

Hide file tree

Showing 11 changed files with 2,037 additions and 0 deletions.
diff --git a/changelogs/unreleased/protobuf_encoder_module.md b/changelogs/unreleased/protobuf_encoder_module.md
@@ -0,0 +1,4 @@
+## feature/lua
+
+* Introduced Lua implementation of protobuf encoder.
+  Four main protobuf types are supported.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -71,6 +71,8 @@ lua_source(lua_sources lua/print.lua print_lua)
 lua_source(lua_sources lua/pairs.lua pairs_lua)
 lua_source(lua_sources lua/compat.lua compat_lua)
 lua_source(lua_sources lua/varbinary.lua varbinary_lua)
+lua_source(lua_sources lua/protobuf_wireformat.lua protobuf_wireformat_lua)
+lua_source(lua_sources lua/protobuf.lua protobuf_lua)
 if (ENABLE_COMPRESS_MODULE)
     lua_source(lua_sources ${COMPRESS_MODULE_LUA_SOURCE} compress_lua)
 endif()

diff --git a/src/lua/init.c b/src/lua/init.c
@@ -136,6 +136,8 @@ extern char minifio_lua[],
 	utils_lua[],
 	argparse_lua[],
 	iconv_lua[],
+	protobuf_wireformat_lua[],
+	protobuf_lua[],
 	/* jit.* library */
 	jit_vmdef_lua[],
 	jit_bc_lua[],
@@ -211,6 +213,8 @@ static const char *lua_modules[] = {
 	"http.client", httpc_lua,
 	"iconv", iconv_lua,
 	"swim", swim_lua,
+	"internal.protobuf.wireformat", protobuf_wireformat_lua,
+	"protobuf", protobuf_lua,
 	COMPRESS_LUA_MODULES
 	/* jit.* library */
 	"jit.vmdef", jit_vmdef_lua,