Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions _glua-tests/issues.lua
Original file line number Diff line number Diff line change
Expand Up @@ -490,3 +490,10 @@ function test()
assert(b == nil)
end
test()

-- issue #478
function test()
local a = "00001" + "00011"
assert(a == 12)
end
test()
22 changes: 22 additions & 0 deletions state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,28 @@ func TestConcat(t *testing.T) {
errorIfNotEqual(t, "a1c", L.Concat(LString("a"), LNumber(1), LString("c")))
}

func TestDoStringNumericStringCoercion(t *testing.T) {
L := NewState()
defer L.Close()

err := L.DoString(`a = "00001" + "00011"`)
errorIfNotNil(t, err)

v := L.GetGlobal("a")
errorIfNotEqual(t, LNumber(12), v)
}

func TestDoStringNumericStringHexCoercion(t *testing.T) {
L := NewState()
defer L.Close()

err := L.DoString(`a = "0x7d6" + "1"`)
errorIfNotNil(t, err)

v := L.GetGlobal("a")
errorIfNotEqual(t, LNumber(2007), v)
}

func TestPCall(t *testing.T) {
L := NewState()
defer L.Close()
Expand Down
24 changes: 18 additions & 6 deletions utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,26 @@ func isArrayKey(v LNumber) bool {
func parseNumber(number string) (LNumber, error) {
var value LNumber
number = strings.Trim(number, " \t\n")
if v, err := strconv.ParseInt(number, 0, LNumberBit); err != nil {
if v2, err2 := strconv.ParseFloat(number, LNumberBit); err2 != nil {
return LNumber(0), err2
} else {
value = LNumber(v2)
if v, err := strconv.ParseInt(number, 10, LNumberBit); err == nil {
value = LNumber(v)
return value, nil
}
if len(number) > 2 {
prefix := number
if number[0] == '+' || number[0] == '-' {
prefix = number[1:]
}
if strings.HasPrefix(prefix, "0x") || strings.HasPrefix(prefix, "0X") {
if v, err := strconv.ParseInt(number, 0, LNumberBit); err == nil {
value = LNumber(v)
return value, nil
}
}
}
if v2, err := strconv.ParseFloat(number, LNumberBit); err != nil {
return LNumber(0), err
} else {
value = LNumber(v)
value = LNumber(v2)
}
return value, nil
}
Expand Down