Open-Argon/argon-v3
1
0
Fork 0
mirror of https://github.com/Open-Argon/argon-v3.git synced 2025-12-06 08:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix json parse not throwing error when incorrect

Browse Source
This commit is contained in:
William Bell
2024-04-05 19:40:57 +02:00
parent 82aae37479
commit bf15b435c2
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/json.go
View File

@@ -33,10 +33,11 @@ func convertToArgon(obj any) any {
return nil
}
func jsonparse(str string) any {
func jsonparse(str string) (any, ArErr) {
var jsonMap any
json.Unmarshal([]byte(str), &jsonMap)
return convertToArgon(jsonMap)
var err = json.Unmarshal([]byte(str), &jsonMap)
if err != nil {return nil, ArErr{TYPE: "Runtime Error", message: err.Error(), EXISTS: true}}
return convertToArgon(jsonMap), ArErr{}
}
func jsonstringify(obj any, level int) (string, error) {
@@ -90,7 +91,7 @@ var ArJSON = Map(anymap{
return nil, ArErr{TYPE: "Runtime Error", message: "parse takes a string not a '" + typeof(args[0]) + "'", EXISTS: true}
}
args[0] = ArValidToAny(args[0])
return jsonparse(args[0].(string)), ArErr{}
return jsonparse(args[0].(string))
}},
"stringify": builtinFunc{"stringify", func(args ...any) (any, ArErr) {
if len(args) == 0 {