Merge pull request #127 from NovaHe/fix/345

fix/345: clean up redundant code
This commit is contained in:
halfrost
2021-05-05 22:36:45 +08:00
committed by GitHub
2 changed files with 24 additions and 32 deletions

View File

@ -3,25 +3,22 @@ package leetcode
func reverseVowels(s string) string { func reverseVowels(s string) string {
b := []byte(s) b := []byte(s)
for i, j := 0, len(b)-1; i < j; { for i, j := 0, len(b)-1; i < j; {
if isVowels(b[i]) && isVowels(b[j]) { if !isVowel(b[i]) {
i++
continue
}
if !isVowel(b[j]) {
j--
continue
}
b[i], b[j] = b[j], b[i] b[i], b[j] = b[j], b[i]
i++ i++
j-- j--
} else if isVowels(b[i]) && !isVowels(b[j]) {
j--
} else if !isVowels(b[i]) && isVowels(b[j]) {
i++
} else {
i++
j--
}
} }
return string(b) return string(b)
} }
func isVowels(s byte) bool { func isVowel(s byte) bool {
if s == 'a' || s == 'e' || s == 'i' || s == 'o' || s == 'u' || s == 'A' || s == 'E' || s == 'I' || s == 'O' || s == 'U' { return s == 'a' || s == 'e' || s == 'i' || s == 'o' || s == 'u' || s == 'A' ||
return true s == 'E' || s == 'I' || s == 'O' || s == 'U'
}
return false
} }

View File

@ -37,35 +37,30 @@ Output: "leotcede"
## 代码 ## 代码
```go ```go
package leetcode package leetcode
func reverseVowels(s string) string { func reverseVowels(s string) string {
b := []byte(s) b := []byte(s)
for i, j := 0, len(b)-1; i < j; { for i, j := 0, len(b)-1; i < j; {
if isVowels(b[i]) && isVowels(b[j]) { if !isVowel(b[i]) {
i++
continue
}
if !isVowel(b[j]) {
j--
continue
}
b[i], b[j] = b[j], b[i] b[i], b[j] = b[j], b[i]
i++ i++
j-- j--
} else if isVowels(b[i]) && !isVowels(b[j]) {
j--
} else if !isVowels(b[i]) && isVowels(b[j]) {
i++
} else {
i++
j--
}
} }
return string(b) return string(b)
} }
func isVowels(s byte) bool { func isVowel(s byte) bool {
if s == 'a' || s == 'e' || s == 'i' || s == 'o' || s == 'u' || s == 'A' || s == 'E' || s == 'I' || s == 'O' || s == 'U' { return s == 'a' || s == 'e' || s == 'i' || s == 'o' || s == 'u' || s == 'A' ||
return true s == 'E' || s == 'I' || s == 'O' || s == 'U'
}
return false
} }
``` ```