From f3cf0d6e15240098147437fed7bd436ff55fdf8c Mon Sep 17 00:00:00 2001

From: Mike Pall <mike>

Date: Sun, 22 Apr 2018 13:14:28 +0200

Subject: [PATCH 36/72] Give expected results for negative non-base-10 numbers

 in tonumber().

This was undefined in Lua 5.1, but it's defined in 5.2.

---

 src/lib_base.c | 27 ++++++++++++++++++---------

 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/lib_base.c b/src/lib_base.c

index 3a75787..d61e876 100644

--- a/src/lib_base.c

+++ b/src/lib_base.c

@@ -287,18 +287,27 @@ LJLIB_ASM(tonumber)		LJLIB_REC(.)

   } else {

     const char *p = strdata(lj_lib_checkstr(L, 1));

     char *ep;

+    unsigned int neg = 0;

     unsigned long ul;

     if (base < 2 || base > 36)

       lj_err_arg(L, 2, LJ_ERR_BASERNG);

-    ul = strtoul(p, &ep, base);

-    if (p != ep) {

-      while (lj_char_isspace((unsigned char)(*ep))) ep++;

-      if (*ep == '\0') {

-	if (LJ_DUALNUM && LJ_LIKELY(ul < 0x80000000u))

-	  setintV(L->base-1-LJ_FR2, (int32_t)ul);

-	else

-	  setnumV(L->base-1-LJ_FR2, (lua_Number)ul);

-	return FFH_RES(1);

+    while (lj_char_isspace((unsigned char)(*p))) p++;

+    if (*p == '-') { p++; neg = 1; } else if (*p == '+') { p++; }

+    if (lj_char_isalnum((unsigned char)(*p))) {

+      ul = strtoul(p, &ep, base);

+      if (p != ep) {

+	while (lj_char_isspace((unsigned char)(*ep))) ep++;

+	if (*ep == '\0') {

+	  if (LJ_DUALNUM && LJ_LIKELY(ul < 0x80000000u+neg)) {

+	    if (neg) ul = -ul;

+	    setintV(L->base-1-LJ_FR2, (int32_t)ul);

+	  } else {

+	    lua_Number n = (lua_Number)ul;

+	    if (neg) n = -n;

+	    setnumV(L->base-1-LJ_FR2, n);

+	  }

+	  return FFH_RES(1);

+	}

       }

     }

   }

-- 

2.20.1