From a0d934af5ffb2e3c60cb85fd4d722b2e38870177 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Mon, 23 Sep 2013 22:05:08 +0400
Subject: [PATCH] Fixes gh-37: print(64-bit number) adds extra newline
A copy-paste implementation of print(64 bit number)
used to add an extra newline at the end of printed string.
---
src/lua/init.cc | 2 +-
test/box/lua.result | 5 +++++
test/box/lua.test | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lua/init.cc b/src/lua/init.cc
index 72b0f48350..54b7560edf 100644
--- a/src/lua/init.cc
+++ b/src/lua/init.cc
@@ -984,7 +984,7 @@ tarantool_lua_printstack(struct lua_State *L, struct tbuf *out)
const char *sz = tarantool_lua_tostring(L, i);
int len = strlen(sz);
int chop = (cd->ctypeid == CTID_UINT64 ? 3 : 2);
- tbuf_printf(out, "%-.*s" CRLF, len - chop, sz);
+ tbuf_printf(out, "%-.*s", len - chop, sz);
} else
tbuf_printf(out, "%s", tarantool_lua_tostring(L, i));
}
diff --git a/test/box/lua.result b/test/box/lua.result
index 95c8a0e1f0..65c907c472 100644
--- a/test/box/lua.result
+++ b/test/box/lua.result
@@ -2047,3 +2047,8 @@ lua t:bsize()
---
- 4
...
+#A test case for gh-37 - print(tonumber64(1)) adds extra newline
+lua print(1, tonumber64(2), 3)
+---
+123
+...
diff --git a/test/box/lua.test b/test/box/lua.test
index b9640c198f..66c639f7ae 100644
--- a/test/box/lua.test
+++ b/test/box/lua.test
@@ -677,8 +677,9 @@ exec admin "lua bug1075677=nil"
exec admin "lua box.tuple.new(false)"
exec admin "lua box.tuple.new({false})"
-
exec admin "lua t = box.tuple.new('abc')"
exec admin "lua t"
exec admin "lua t:bsize()"
exec admin silent "lua box.delete(0, 8989)"
+print """#A test case for gh-37 - print(tonumber64(1)) adds extra newline"""
+exec admin "lua print(1, tonumber64(2), 3)"
--
GitLab