add hex support for pure json

2 files changed, 9 insertions, 2 deletions

diff --git a/tests/modules/json/test.lua b/tests/modules/json/test.lua
index 9657a2e5e..ad0e84ac6 100755
--- a/tests/modules/json/test.lua
+++ b/tests/modules/json/test.lua
@@ -63,7 +63,7 @@ function test_pure_json_decode(t)
     t:are_equal(json_pure_decode('{"a":[], "b":[1,2], "c":{"a":1}}'), {a = {}, b = {1,2}, c = {a = 1}})
     t:are_equal(json_pure_decode('[1,"2"]'), {1, "2"})
     t:are_equal(json_pure_decode('[1,"2", {"a":1, "b":true}]'), {1, "2", {a = 1, b = true}})
---    t:are_equal(json_pure_decode('[1,0xa,0xdeadbeef, 0xffffffff,-1]'), {1, 0xa, 0xdeadbeef, 0xffffffff, -1})
+    t:are_equal(json_pure_decode('[1,0xa,0xdeadbeef, 0xffffffff,-1]'), {1, 0xa, 0xdeadbeef, 0xffffffff, -1})
 end
 
 function test_pure_json_encode(t)
diff --git a/xmake/core/base/json.lua b/xmake/core/base/json.lua
index bf1dfae3e..487e4b062 100644
--- a/xmake/core/base/json.lua
+++ b/xmake/core/base/json.lua
@@ -26,6 +26,8 @@ local io    = require("base/io")
 local os    = require("base/os")
 local utils = require("base/utils")
 
+cjson = nil
+
 -- export null
 if cjson then
     json.null = cjson.null
@@ -116,7 +118,12 @@ function json._pure_parse_str_val(str, pos, val)
 end
 
 function json._pure_parse_num_val(str, pos)
-    local num_str = str:match('^-?%d+%.?%d*[eE]?[+-]?%d*', pos)
+    local num_str
+    if str:sub(pos, pos + 1) == "0x" then
+        num_str = str:match('^-?0[xX][0-9a-fA-F]+', pos)
+    else
+        num_str = str:match('^-?%d+%.?%d*[eE]?[+-]?%d*', pos)
+    end
     local val = tonumber(num_str)
     if not val then
         os.raise("error parsing number at position %d", pos)