Skip to content

Commit

Permalink
fix(vim.mpack): rename pack/unpack => encode/decode neovim#16175
Browse files Browse the repository at this point in the history
Problem:
1. "unpack" has an unrelated meaning in Lua:
   https://www.lua.org/manual/5.1/manual.html#pdf-unpack
2. We already have msgpackparse()/msgpackdump() and
   json_encode()/json_decode(), so introducing another name for the same
   thing is entropy.

Solution:
- Rename vim.mpack.pack/unpack => vim.mpack.encode/decode

Caveat:
This is incongruent with the `Unpacker` and `Packer` functions.
- It's probably too invasive to rename those.
- They also aren't part of our documented interface.
- This commit is "reversible" in the sense that we can always revert
  it and add `vim.mpack.encode/decode` as _aliases_ to
  `vim.mpack.pack/unpack`, at any time in the future, if we want
  stricter fidelity with upstream libmpack. Meanwhile,
  `vim.mpack.encode/decode` is currently the total _documented_
  interface of `vim.mpack`, so this change serves the purpose of
  consistent naming in the Nvim stdlib.
  • Loading branch information
justinmk authored Oct 30, 2021
1 parent eb6a103 commit a141f6e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
13 changes: 6 additions & 7 deletions runtime/doc/lua.txt
Original file line number Diff line number Diff line change
Expand Up @@ -698,15 +698,14 @@ vim.diff({a}, {b}, {opts}) *vim.diff()*
------------------------------------------------------------------------------
VIM.MPACK *lua-mpack*

The *vim.mpack* module provides packing and unpacking of lua objects to
msgpack encoded strings. |vim.NIL| and |vim.empty_dict()| are supported.
The *vim.mpack* module provides encoding and decoding of Lua objects to and
from msgpack-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.

vim.mpack.pack({obj}) *vim.mpack.pack*
Packs a lua object {obj} and returns the msgpack representation as
a string
vim.mpack.encode({obj}) *vim.mpack.encode*
Encodes (or "packs") Lua object {obj} as msgpack in a Lua string.

vim.mpack.unpack({str}) *vim.mpack.unpack*
Unpacks the msgpack encoded {str} and returns a lua object
vim.mpack.decode({str}) *vim.mpack.decode*
Decodes (or "unpacks") the msgpack-encoded {str} to a Lua object.

------------------------------------------------------------------------------
VIM *lua-builtin*
Expand Down
14 changes: 8 additions & 6 deletions src/mpack/lmpack.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
#include "rpc.h"

#define UNPACKER_META_NAME "mpack.Unpacker"
#define UNPACK_FN_NAME "decode"
#define PACKER_META_NAME "mpack.Packer"
#define PACK_FN_NAME "encode"
#define SESSION_META_NAME "mpack.Session"
#define NIL_NAME "mpack.NIL"
#define EMPTY_DICT_NAME "mpack.empty_dict"
Expand Down Expand Up @@ -432,8 +434,8 @@ static int lmpack_unpacker_unpack_str(lua_State *L, Unpacker *unpacker,

if (unpacker->unpacking) {
return luaL_error(L, "Unpacker instance already working. Use another "
"Unpacker or the module's \"unpack\" function if you "
"need to unpack from the ext handler");
"Unpacker or mpack." UNPACK_FN_NAME "() if you "
"need to " UNPACK_FN_NAME " from the ext handler");
}

do {
Expand Down Expand Up @@ -784,8 +786,8 @@ static int lmpack_packer_pack(lua_State *L)

if (packer->packing) {
return luaL_error(L, "Packer instance already working. Use another Packer "
"or the module's \"pack\" function if you need to "
"pack from the ext handler");
"or mpack." PACK_FN_NAME "() if you need to "
PACK_FN_NAME " from the ext handler");
}

do {
Expand Down Expand Up @@ -1161,8 +1163,8 @@ static const luaL_reg mpack_functions[] = {
{"Unpacker", lmpack_unpacker_new},
{"Packer", lmpack_packer_new},
{"Session", lmpack_session_new},
{"unpack", lmpack_unpack},
{"pack", lmpack_pack},
{UNPACK_FN_NAME, lmpack_unpack},
{PACK_FN_NAME, lmpack_pack},
{NULL, NULL}
};

Expand Down
8 changes: 4 additions & 4 deletions test/functional/lua/mpack_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ local exec_lua = helpers.exec_lua

describe('lua vim.mpack', function()
before_each(clear)
it('can pack vim.NIL', function()
it('encodes vim.NIL', function()
eq({true, true, true, true}, exec_lua [[
local var = vim.mpack.unpack(vim.mpack.pack({33, vim.NIL, 77}))
local var = vim.mpack.decode(vim.mpack.encode({33, vim.NIL, 77}))
return {var[1]==33, var[2]==vim.NIL, var[3]==77, var[4]==nil}
]])
end)

it('can pack vim.empty_dict()', function()
it('encodes vim.empty_dict()', function()
eq({{{}, "foo", {}}, true, false}, exec_lua [[
local var = vim.mpack.unpack(vim.mpack.pack({{}, "foo", vim.empty_dict()}))
local var = vim.mpack.decode(vim.mpack.encode({{}, "foo", vim.empty_dict()}))
return {var, vim.tbl_islist(var[1]), vim.tbl_islist(var[3])}
]])
end)
Expand Down

0 comments on commit a141f6e

Please sign in to comment.