From d99cc3be545aa7f827030ec0ac502c00f530f8bf Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Mon, 11 Dec 2017 15:48:32 +1100
Subject: src/{llex,lobject}.js: Fix luaO_utf8esc/luaO_utf8desc confusion

---
 src/llex.js    |  6 +++---
 src/lobject.js | 24 +-----------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/llex.js b/src/llex.js
index 9e27d02..19f2c05 100644
--- a/src/llex.js
+++ b/src/llex.js
@@ -369,9 +369,9 @@ const readutf8desc = function(ls) {
 };
 
 const utf8esc = function(ls) {
-    let u = lobject.luaO_utf8esc(readutf8desc(ls));
-    let buff = u.buff;
-    for (let n = u.n; n > 0; n--)  /* add 'buff' to string */
+    let buff = new Array(lobject.UTF8BUFFSZ);
+    let n = lobject.luaO_utf8esc(buff, readutf8desc(ls));
+    for (; n > 0; n--)  /* add 'buff' to string */
         save(ls, buff[lobject.UTF8BUFFSZ - n]);
 };
 
diff --git a/src/lobject.js b/src/lobject.js
index becec17..e69a9ef 100644
--- a/src/lobject.js
+++ b/src/lobject.js
@@ -336,7 +336,7 @@ const luaO_hexavalue = function(c) {
 
 const UTF8BUFFSZ = 8;
 
-const luaO_utf8desc = function(buff, x) {
+const luaO_utf8esc = function(buff, x) {
     let n = 1;  /* number of bytes put in buffer (backwards) */
     assert(x <= 0x10FFFF);
     if (x < 0x80)  /* ascii? */
@@ -491,27 +491,6 @@ const luaO_str2num = function(s) {
     }
 };
 
-const luaO_utf8esc = function(x) {
-    let buff = [];
-    let n = 1;  /* number of bytes put in buffer (backwards) */
-    assert(x <= 0x10ffff);
-    if (x < 0x80)  /* ascii? */
-        buff[UTF8BUFFSZ - 1] = x;
-    else {  /* need continuation bytes */
-        let mfb = 0x3f;  /* maximum that fits in first byte */
-        do {  /* add continuation bytes */
-            buff[UTF8BUFFSZ - (n++)] = 0x80 | (x & 0x3f);
-            x >>= 6;  /* remove added bits */
-            mfb >>= 1;  /* now there is one less bit available in first byte */
-        } while (x > mfb);  /* still needs continuation byte? */
-        buff[UTF8BUFFSZ - n] = (~mfb << 1) | x;  /* add first byte */
-    }
-    return {
-        buff: buff,
-        n: n
-    };
-};
-
 /* this currently returns new TValue instead of modifying */
 const luaO_tostring = function(L, obj) {
     let buff;
@@ -733,7 +712,6 @@ module.exports.luaO_pushfstring  = luaO_pushfstring;
 module.exports.luaO_pushvfstring = luaO_pushvfstring;
 module.exports.luaO_str2num      = luaO_str2num;
 module.exports.luaO_tostring     = luaO_tostring;
-module.exports.luaO_utf8desc     = luaO_utf8desc;
 module.exports.luaO_utf8esc      = luaO_utf8esc;
 module.exports.numarith          = numarith;
 module.exports.pushobj2s         = pushobj2s;
-- 
cgit v1.2.3-70-g09d2