vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

json2: improve readability, add tests utilizing fix #12667 (#12836)

pull/12853/head
Larpon 2021-12-15 11:20:05 +01:00 committed by GitHub
parent 5b5d0bbb9c
commit 1d41d9daf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/x/json2/encoder.v
View File

@ -69,10 +69,7 @@ pub fn (f Any) json_str() string {
string { string {
return json_string(f) return json_string(f)
} }
int { bool, int, u64, i64 {
return f.str()
}
u64, i64 {
return f.str() return f.str()
} }
f32 { f32 {
@ -89,9 +86,6 @@ pub fn (f Any) json_str() string {
} }
return str_f64 return str_f64
} }
bool {
return f.str()
}
map[string]Any { map[string]Any {
return f.str() return f.str()
} }

8
vlib/x/json2/encoder_test.v
View File

@ -15,6 +15,14 @@ fn test_json_escape_low_chars() {
fn test_json_string() { fn test_json_string() {
text := json2.Any('te✔st') text := json2.Any('te✔st')
assert text.json_str() == r'te\u2714st' assert text.json_str() == r'te\u2714st'
boolean := json2.Any(true)
assert boolean.json_str() == 'true'
integer := json2.Any(int(-5))
assert integer.json_str() == '-5'
u64integer := json2.Any(u64(5000))
assert u64integer.json_str() == '5000'
i64integer := json2.Any(i64(-17))
assert i64integer.json_str() == '-17'
} }
fn test_json_string_emoji() { fn test_json_string_emoji() {