TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-09 15:27:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

builtin: fix assert 'JVM_PUBLIC_ACC'.camel_to_snake() == 'jvm_public_acc' (#21722)

Browse Source
This commit is contained in:
Turiiya 2024-06-24 22:01:52 +02:00 committed by GitHub
parent 2b0938da75
commit c5c49d3685
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vlib/builtin/string.v
View File

@ -2647,26 +2647,38 @@ pub fn (s string) camel_to_snake() string {
if s.len == 0 { if s.len == 0 {
return '' return ''
} }
lower_first_char := if s[0] >= `A` && s[0] <= `Z` { s[0] + 32 } else { s[0] }
if s.len == 1 { if s.len == 1 {
return lower_first_char.ascii_str() return s.to_lower()
} }
mut b := unsafe { malloc_noscan(2 * s.len + 1) } mut b := unsafe { malloc_noscan(2 * s.len + 1) }
second_char := if s[1] >= `A` && s[1] <= `Z` { `_` } else { s[1] } mut prev_is_upper := false
first_char, second_char := if s[0] >= `A` && s[0] <= `Z` {
lower_first_c := if s[0] >= `A` && s[0] <= `Z` { s[0] + 32 } else { s[0] }
lower_second_c := if s[1] >= `A` && s[1] <= `Z` {
prev_is_upper = true
s[1] + 32
} else {
s[1]
}
lower_first_c, lower_second_c
} else {
lower_first_c := s[0]
second_c := if s[1] >= `A` && s[1] <= `Z` { u8(`_`) } else { s[1] }
lower_first_c, second_c
}
unsafe { unsafe {
b[0] = lower_first_char b[0] = first_char
b[1] = second_char b[1] = second_char
} }
mut pos := 2
mut prev_char := second_char mut prev_char := second_char
mut prev_is_upper := false
mut lower_c := `_` mut lower_c := `_`
mut c_is_upper := false mut c_is_upper := false
mut pos := 1
for i in pos .. s.len { for i in pos .. s.len {
c := s[i] c := s[i]
c_is_upper = c >= `A` && c <= `Z` c_is_upper = c >= `A` && c <= `Z`
lower_c = if c_is_upper { c + 32 } else { c } lower_c = if c_is_upper { c + 32 } else { c }
if prev_is_upper == false && c_is_upper { if !prev_is_upper && c_is_upper {
// aB => a_b, if prev has `_`, then do not add `_` // aB => a_b, if prev has `_`, then do not add `_`
unsafe { unsafe {
if b[pos - 1] != `_` { if b[pos - 1] != `_` {
@ -2674,7 +2686,7 @@ pub fn (s string) camel_to_snake() string {
pos++ pos++
} }
} }
} else if prev_is_upper && c_is_upper == false && c != `_` { } else if prev_is_upper && !c_is_upper && c != `_` {
// Ba => _ba, if prev has `_`, then do not add `_` // Ba => _ba, if prev has `_`, then do not add `_`
unsafe { unsafe {
if b[pos - 2] != `_` { if b[pos - 2] != `_` {

1
vlib/builtin/string_test.v
View File

@ -1528,6 +1528,7 @@ fn test_camel_to_snake() {
assert 'aaBbCcDD'.camel_to_snake() == 'aa_bb_cc_dd' assert 'aaBbCcDD'.camel_to_snake() == 'aa_bb_cc_dd'
assert 'BBaa'.camel_to_snake() == 'b_baa' assert 'BBaa'.camel_to_snake() == 'b_baa'
assert 'aa_BB'.camel_to_snake() == 'aa_bb' assert 'aa_BB'.camel_to_snake() == 'aa_bb'
assert 'JVM_PUBLIC_ACC'.camel_to_snake() == 'jvm_public_acc'
} }
fn test_snake_to_camel() { fn test_snake_to_camel() {