Issue yuin#472: tonumber does not handle E notation correctly

hugebubu · Jan 3, 2024 · c225c40 · c225c40
1 parent 2348fd0
commit c225c40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/_lua5.1-tests/math.lua b/_lua5.1-tests/math.lua
@@ -33,6 +33,8 @@ assert(tonumber'+ 0.01' == nil and tonumber'+.e1' == nil and
        tonumber'.' == nil)
 assert(tonumber('-12') == -10-2)
 assert(tonumber('-1.2e2') == - - -120)
+assert(tonumber('2e2') == 200)
+assert(tonumber('2e2', 15) == 662)
 assert(f(tonumber('1  a')) == nil)
 assert(f(tonumber('e1')) == nil)
 assert(f(tonumber('e  1')) == nil)

diff --git a/baselib.go b/baselib.go
@@ -410,7 +410,7 @@ func baseToNumber(L *LState) int {
 		L.Push(lv)
 	case LString:
 		str := strings.Trim(string(lv), " \n\t")
-		if strings.Index(str, ".") > -1 {
+		if base == 10 && strings.ContainsAny(str, ".eE") {
 			if v, err := strconv.ParseFloat(str, LNumberBit); err != nil {
 				L.Push(LNil)
 			} else {