From f2b5ac73dc0cf6b025af5045e43ca63f67b491fb Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Tue, 27 Aug 2013 16:57:44 +0400
Subject: [PATCH] lua-plus-dict: use old tuple print format
---
src/lua/init.cc | 14 --------------
third_party/lua-yaml/lyaml.c | 13 ++++++++-----
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/lua/init.cc b/src/lua/init.cc
index 9045960ba5..4a091954df 100644
--- a/src/lua/init.cc
+++ b/src/lua/init.cc
@@ -663,20 +663,6 @@ tarantool_lua(struct lua_State *L,
lua_settop(L, 0);
return;
}
- /* convert all tuples to tables */
- for (int i = 1; i <= top; i++) {
- if (lua_getmetatable(L, i) == 0)
- continue;
- luaL_getmetatable(L, "box.tuple");
- int is_tuple = 0;
- if (lua_equal(L, -1, -2))
- is_tuple = 1;
- lua_pop(L, 2);
- if (is_tuple) {
- luaL_callmeta(L, i, "totable");
- lua_replace(L, i);
- }
- }
yamlL_encode(L);
lua_replace(L, 1);
lua_pop(L, 1);
diff --git a/third_party/lua-yaml/lyaml.c b/third_party/lua-yaml/lyaml.c
index 9c2a67dc59..3614c5d2ff 100644
--- a/third_party/lua-yaml/lyaml.c
+++ b/third_party/lua-yaml/lyaml.c
@@ -436,15 +436,18 @@ static int dump_scalar(struct lua_yaml_dumper *dumper) {
len -= 2;
break;
}
- } else if (type == LUA_TUSERDATA || type == LUA_TFUNCTION) {
+ } else if (type == LUA_TUSERDATA) {
+ str = dump_tostring(dumper->L, -1);
+ len = strlen(str);
+ style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
+ } else if (type == LUA_TFUNCTION) {
str = dump_tostring(dumper->L, -1);
len = strlen(str);
}
-
- yaml_scalar_event_initialize(
- &ev, NULL, tag, (unsigned char *)str, len,
+ yaml_scalar_event_initialize(&ev, NULL, tag, (unsigned char *)str, len,
!is_binary, !is_binary, style);
- if (is_binary) lua_pop(dumper->L, 1);
+ if (is_binary)
+ lua_pop(dumper->L, 1);
return yaml_emitter_emit(&dumper->emitter, &ev);
}
--
GitLab