Merge branch 'master' into v2.1

2020-10-12 16:18:02 +02:00
parent 675e08cf06 050466552b
commit 1d8b747c16
19 changed files with 49 additions and 49 deletions
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -504,8 +504,8 @@ LJLIB_CF(print)
    lua_gettable(L, LUA_GLOBALSINDEX);
    tv = L->top-1;
  }
-  shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring)
-	      && !gcrefu(basemt_it(G(L), LJ_TNUMX));
+  shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring) &&
+	     !gcrefu(basemt_it(G(L), LJ_TNUMX));
  for (i = 0; i < nargs; i++) {
    cTValue *o = &L->base[i];
    const char *str;