mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 22:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

undo accidental string_ renames

Browse source
This commit is contained in:
Larsimusrex 2025-08-09 10:30:50 +02:00
parent 7b6dc40370
commit ac2c6dbc95
10 changed files with 110 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

38
vlib/x/json2/decoder2/decode.v
View file

@ -368,52 +368,52 @@ fn (mut decoder Decoder) decode_value[T](mut val T) ! {
}
}
$if T.unaliased_typ is string {
stringinfo := decoder.current_node.value
string_info := decoder.current_node.value
if stringinfo.value_kind == .string {
mut stringbuffer := []u8{cap: stringinfo.length} // might be too long but most json strings don't contain many escape characters anyways
if string_info.value_kind == .string {
mut string_buffer := []u8{cap: string_info.length} // might be too long but most json strings don't contain many escape characters anyways
mut buffer_index := 1
mut stringindex := 1
for stringindex < stringinfo.length - 1 {
current_byte := decoder.json[stringinfo.position + stringindex]
for stringindex < string_info.length - 1 {
current_byte := decoder.json[string_info.position + stringindex]
if current_byte == `\\` {
// push all characters up to this point
unsafe {
stringbuffer.push_many(decoder.json.str + stringinfo.position + buffer_index,
stringindex - buffer_index)
string_buffer.push_many(decoder.json.str + string_info.position +
buffer_index, stringindex - buffer_index)
}
stringindex++
escaped_char := decoder.json[stringinfo.position + stringindex]
escaped_char := decoder.json[string_info.position + stringindex]
stringindex++
match escaped_char {
`/`, `"`, `\\` {
stringbuffer << escaped_char
string_buffer << escaped_char
}
`b` {
stringbuffer << `\b`
string_buffer << `\b`
}
`f` {
stringbuffer << `\f`
string_buffer << `\f`
}
`n` {
stringbuffer << `\n`
string_buffer << `\n`
}
`r` {
stringbuffer << `\r`
string_buffer << `\r`
}
`t` {
stringbuffer << `\t`
string_buffer << `\t`
}
`u` {
stringbuffer << rune(strconv.parse_uint(decoder.json[
stringinfo.position + stringindex..stringinfo.position +
string_buffer << rune(strconv.parse_uint(decoder.json[
string_info.position + stringindex..string_info.position +
stringindex + 4], 16, 32)!).bytes()
stringindex += 4
@ -429,13 +429,13 @@ fn (mut decoder Decoder) decode_value[T](mut val T) ! {
// push the rest
unsafe {
stringbuffer.push_many(decoder.json.str + stringinfo.position + buffer_index,
string_buffer.push_many(decoder.json.str + string_info.position + buffer_index,
stringindex - buffer_index)
}
val = stringbuffer.bytestr()
val = string_buffer.bytestr()
} else {
return decoder.decode_error('Expected string, but got ${stringinfo.value_kind}')
return decoder.decode_error('Expected string, but got ${string_info.value_kind}')
}
} $else $if T.unaliased_typ is $sumtype {
decoder.decode_sumtype(mut val)!

4
vlib/x/json2/decoder2/tests/json2_tests/decoder_test.v
View file

@ -6,7 +6,7 @@ fn test_raw_decode_string() {
assert str.str() == 'Hello!'
}
fn test_raw_decode_stringescape() {
fn test_raw_decode_string_escape() {
jstr := json.decode[json2.Any]('"\u001b"')!
str := jstr.str()
assert str.len == 1
@ -37,7 +37,7 @@ fn test_raw_decode_map() {
assert mp['age'] or { 0 }.int() == 20
}
fn test_raw_decode_stringwith_dollarsign() {
fn test_raw_decode_string_with_dollarsign() {
str := json.decode[json2.Any](r'"Hello $world"')!
assert str.str() == r'Hello $world'
}

6
vlib/x/json2/decoder2/tests/json2_tests/encoder_test.v
View file

@ -8,7 +8,7 @@ mut:
val T
}
fn test_json_stringcharacters() {
fn test_json_string_characters() {
assert json2.encode([u8(`/`)].bytestr()).bytes() == r'"\/"'.bytes()
assert json2.encode([u8(`\\`)].bytestr()).bytes() == r'"\\"'.bytes()
assert json2.encode([u8(`"`)].bytestr()).bytes() == r'"\""'.bytes()
@ -53,7 +53,7 @@ fn test_json_string() {
assert i64integer.json_str() == '-17'
}
fn test_json_stringemoji() {
fn test_json_string_emoji() {
text := json2.Any('🐈')
assert text.json_str() == r'"🐈"'
assert json2.Any('💀').json_str() == r'"💀"'
@ -63,7 +63,7 @@ fn test_json_stringemoji() {
assert json2.encode('🐈💀') == r'"🐈💀"'
}
fn test_json_stringnon_ascii() {
fn test_json_string_non_ascii() {
text := json2.Any('ひらがな')
assert text.json_str() == r'"\u3072\u3089\u304c\u306a"'

2
vlib/x/json2/decoder2/tests/json2_tests/json2_test.v
View file

@ -46,7 +46,7 @@ fn test_struct_with_bool_to_map() {
assert array_of_map.str() == '[{"val":true},{"val":false}]'
}
fn test_struct_with_stringto_map() {
fn test_struct_with_string_to_map() {
array_of_struct := [StructType[string]{
val: 'true'
}, StructType[string]{

4
vlib/x/json2/tests/decoder_test.v
View file

@ -5,7 +5,7 @@ fn test_raw_decode_string() {
assert str.str() == 'Hello!'
}
fn test_raw_decode_stringescape() {
fn test_raw_decode_string_escape() {
jstr := json.raw_decode('"\\u001b"')!
str := jstr.str()
assert str.len == 1
@ -49,7 +49,7 @@ fn test_raw_decode_invalid() {
assert false
}
fn test_raw_decode_stringwith_dollarsign() {
fn test_raw_decode_string_with_dollarsign() {
str := json.raw_decode(r'"Hello $world"')!
assert str.str() == r'Hello $world'
}

50
vlib/x/json2/tests/encode_struct_skippable_fields_test.v
View file

@ -83,66 +83,66 @@ mut:
fn test_encode_struct_skipped_fields() {
assert json.encode(StructTypeSkippedFields[string]{
val: 'stringval'
val1: 'stringval1'
val2: 'stringval2'
val3: 'stringval3'
}) == '{"val1":"stringval1","val3":"stringval3"}'
val: 'string_val'
val1: 'string_val1'
val2: 'string_val2'
val3: 'string_val3'
}) == '{"val1":"string_val1","val3":"string_val3"}'
assert json.encode(StructTypeSkippedFields1[string]{
val: 'stringval'
val1: 'stringval1'
val2: 'stringval2'
val3: 'stringval3'
}) == '{"val":"stringval","val2":"stringval2"}'
val: 'string_val'
val1: 'string_val1'
val2: 'string_val2'
val3: 'string_val3'
}) == '{"val":"string_val","val2":"string_val2"}'
assert json.encode(StructTypeSkippedFields2[string]{
val: 'stringval'
val1: 'stringval1'
val2: 'stringval2'
val3: 'stringval3'
val: 'string_val'
val1: 'string_val1'
val2: 'string_val2'
val3: 'string_val3'
}) == '{}'
assert json.encode(StructTypeSkippedFields3[string, i64, f64]{
val: 'stringval'
val: 'string_val'
val1: 1
val2: 1.0
val3: 'stringval'
val3: 'string_val'
}) == '{"val1":1,"val2":1}'
assert json.encode(StructTypeSkippedFields4{
val: 'stringval'
val: 'string_val'
val1: 1
val2: 1.0
}) == '{"val1":1,"val2":1,"val3":"0000-00-00T00:00:00.000Z"}'
assert json.encode(StructTypeSkippedFields5{
val: 'stringval'
val: 'string_val'
val1: 1
val2: 1.0
}) == '{"val2":1,"val3":"0000-00-00T00:00:00.000Z"}'
assert json.encode(StructTypeSkippedFields6{
val: 'stringval'
val: 'string_val'
val1: 1
val2: 1.0
}) == '{"val1":1,"val3":"0000-00-00T00:00:00.000Z"}'
assert json.encode(StructTypeSkippedFields7{
val: 'stringval'
val: 'string_val'
val1: 1
val2: 1.0
}) == '{"val":"stringval","val3":"0000-00-00T00:00:00.000Z"}'
}) == '{"val":"string_val","val3":"0000-00-00T00:00:00.000Z"}'
assert json.encode(StructTypeSkippedFields8{
val: 'stringval'
val: 'string_val'
val1: 1
val2: 1.0
}) == '{"val":"stringval","val2":1}'
}) == '{"val":"string_val","val2":1}'
assert json.encode(StructTypeSkippedFields9{
val: 'stringval'
val: 'string_val'
val1: 1
val2: 1.0
}) == '{"val":"stringval","val2":1}'
}) == '{"val":"string_val","val2":1}'
}

8
vlib/x/json2/tests/encode_struct_test.v
View file

@ -232,11 +232,11 @@ fn test_alias() {
}
fn test_pointer() {
mut stringinitialized_with_reference := ''
mut string_initialized_with_reference := ''
assert json.encode(StructTypePointer[string]{ val: unsafe { nil } }) == '{}'
assert json.encode(StructTypePointer[string]{ val: &stringinitialized_with_reference }) == '{"val":""}'
stringinitialized_with_reference = 'a'
assert json.encode(StructTypePointer[string]{ val: &stringinitialized_with_reference }) == '{"val":"a"}'
assert json.encode(StructTypePointer[string]{ val: &string_initialized_with_reference }) == '{"val":""}'
string_initialized_with_reference = 'a'
assert json.encode(StructTypePointer[string]{ val: &string_initialized_with_reference }) == '{"val":"a"}'
mut bool_initialized_with_reference := false
assert json.encode(StructTypePointer[bool]{ val: unsafe { nil } }) == '{}'

100
vlib/x/json2/tests/encode_struct_todo_test.vv
View file

@ -108,25 +108,25 @@ fn test_option_sumtypes() {
}
fn test_caos() {
typed_stringstruct := StructType[string]{
typed_string_struct := StructType[string]{
val: 'a'
}
// StructType
assert json.encode(StructType[StructType]{}) == 'TODO'
assert json.encode(StructType[StructType[string]]{ val: typed_stringstruct }) == 'TODO'
assert json.encode(StructType[StructType[StringAlias]]{ val: typed_stringstruct }) == 'TODO'
assert json.encode(StructType[StructType[SumTypes]]{ val: typed_stringstruct }) == 'TODO'
assert json.encode(StructType[StructType[string]]{ val: typed_string_struct }) == 'TODO'
assert json.encode(StructType[StructType[StringAlias]]{ val: typed_string_struct }) == 'TODO'
assert json.encode(StructType[StructType[SumTypes]]{ val: typed_string_struct }) == 'TODO'
assert json.encode(StructType[StructTypeOption]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[StructTypeOption]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[StructTypeOption[string]]{ val: StructType{'a'} }) == 'TODO'
assert json.encode(StructType[StructTypeOption[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[StructTypeOption[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[StructTypeOption[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[StructTypeOption[SumTypes]]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[StructTypePointer]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[StructTypePointer[string]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[StructTypePointer[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[StructTypePointer[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[StructTypePointer]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[StructTypePointer[string]]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[StructTypePointer[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[StructTypePointer[SumTypes]]{typed_string_struct}) == 'TODO'
// StructTypeOptional
assert json.encode(StructTypeOption[StructType]{}) == 'TODO'
@ -134,15 +134,15 @@ fn test_caos() {
assert json.encode(StructTypeOption[StructType[StringAlias]]{ val: '' }) == 'TODO'
assert json.encode(StructTypeOption[StructType[SumTypes]]{ val: '' }) == 'TODO'
assert json.encode(StructTypeOption[StructTypeOption]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypeOption]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypeOption[string]]{ val: StructType{'a'} }) == 'TODO'
assert json.encode(StructTypeOption[StructTypeOption[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypeOption[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypeOption[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypeOption[SumTypes]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypePointer]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypePointer[string]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypePointer[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypePointer[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypePointer]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypePointer[string]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypePointer[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[StructTypePointer[SumTypes]]{typed_string_struct}) == 'TODO'
// StructTypePointer
assert json.encode(StructTypePointer[StructType]{}) == 'TODO'
@ -150,37 +150,37 @@ fn test_caos() {
assert json.encode(StructTypePointer[StructType[StringAlias]]{ val: '' }) == 'TODO'
assert json.encode(StructTypePointer[StructType[SumTypes]]{ val: '' }) == 'TODO'
assert json.encode(StructTypePointer[StructTypeOption]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypeOption]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypeOption[string]]{ val: StructType{'a'} }) == 'TODO'
assert json.encode(StructTypePointer[StructTypeOption[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypeOption[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypeOption[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypeOption[SumTypes]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypePointer]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypePointer[string]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypePointer[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypePointer[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypePointer]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypePointer[string]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypePointer[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[StructTypePointer[SumTypes]]{typed_string_struct}) == 'TODO'
}
fn test_caos_array() {
typed_stringstruct := [StructType[string]{
typed_string_struct := [StructType[string]{
val: 'a'
}]
// StructType
assert json.encode(StructType[[]StructType]{}) == 'TODO'
assert json.encode(StructType[[]StructType[string]]{ val: typed_stringstruct }) == 'TODO'
assert json.encode(StructType[[]StructType[StringAlias]]{ val: typed_stringstruct }) == 'TODO'
assert json.encode(StructType[[]StructType[SumTypes]]{ val: typed_stringstruct }) == 'TODO'
assert json.encode(StructType[[]StructType[string]]{ val: typed_string_struct }) == 'TODO'
assert json.encode(StructType[[]StructType[StringAlias]]{ val: typed_string_struct }) == 'TODO'
assert json.encode(StructType[[]StructType[SumTypes]]{ val: typed_string_struct }) == 'TODO'
assert json.encode(StructType[[]StructTypeOption]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[[]StructTypeOption]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[[]StructTypeOption[string]]{ val: StructType{'a'} }) == 'TODO'
assert json.encode(StructType[[]StructTypeOption[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[[]StructTypeOption[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[[]StructTypeOption[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[[]StructTypeOption[SumTypes]]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[[]StructTypePointer]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[[]StructTypePointer[string]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[[]StructTypePointer[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[[]StructTypePointer[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructType[[]StructTypePointer]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[[]StructTypePointer[string]]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[[]StructTypePointer[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructType[[]StructTypePointer[SumTypes]]{typed_string_struct}) == 'TODO'
// StructTypeOptional
assert json.encode(StructTypeOption[[]StructType]{}) == 'TODO'
@ -188,15 +188,15 @@ fn test_caos_array() {
assert json.encode(StructTypeOption[[]StructType[StringAlias]]{ val: '' }) == 'TODO'
assert json.encode(StructTypeOption[[]StructType[SumTypes]]{ val: '' }) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypeOption]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypeOption]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypeOption[string]]{ val: StructType{'a'} }) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypeOption[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypeOption[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypeOption[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypeOption[SumTypes]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypePointer]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypePointer[string]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypePointer[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypePointer[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypePointer]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypePointer[string]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypePointer[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypeOption[[]StructTypePointer[SumTypes]]{typed_string_struct}) == 'TODO'
// StructTypePointer
assert json.encode(StructTypePointer[[]StructType]{}) == 'TODO'
@ -204,13 +204,13 @@ fn test_caos_array() {
assert json.encode(StructTypePointer[[]StructType[StringAlias]]{ val: '' }) == 'TODO'
assert json.encode(StructTypePointer[[]StructType[SumTypes]]{ val: '' }) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypeOption]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypeOption]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypeOption[string]]{ val: StructType{'a'} }) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypeOption[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypeOption[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypeOption[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypeOption[SumTypes]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypePointer]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypePointer[string]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypePointer[StringAlias]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypePointer[SumTypes]]{typed_stringstruct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypePointer]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypePointer[string]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypePointer[StringAlias]]{typed_string_struct}) == 'TODO'
assert json.encode(StructTypePointer[[]StructTypePointer[SumTypes]]{typed_string_struct}) == 'TODO'
}

6
vlib/x/json2/tests/encoder_test.v
View file

@ -7,7 +7,7 @@ mut:
val T
}
fn test_json_stringcharacters() {
fn test_json_string_characters() {
assert json.encode([u8(`/`)].bytestr()).bytes() == r'"\/"'.bytes()
assert json.encode([u8(`\\`)].bytestr()).bytes() == r'"\\"'.bytes()
assert json.encode([u8(`"`)].bytestr()).bytes() == r'"\""'.bytes()
@ -55,7 +55,7 @@ fn test_json_string() {
assert i64integer.json_str() == '-17'
}
fn test_json_stringemoji() {
fn test_json_string_emoji() {
text := json.Any('🐈')
assert text.json_str() == r'"🐈"'
assert json.Any('💀').json_str() == r'"💀"'
@ -65,7 +65,7 @@ fn test_json_stringemoji() {
// assert json.encode('🐈💀') == r'"🐈💀"'
}
fn test_json_stringnon_ascii() {
fn test_json_string_non_ascii() {
text := json.Any('ひらがな')
assert text.json_str() == r'"\u3072\u3089\u304c\u306a"'

2
vlib/x/json2/tests/json2_test.v
View file

@ -66,7 +66,7 @@ fn test_struct_with_bool_to_map() {
assert array_of_map.str() == '[{"val":true},{"val":false}]'
}
fn test_struct_with_stringto_map() {
fn test_struct_with_string_to_map() {
array_of_struct := [StructType[string]{
val: 'true'
}, StructType[string]{