From aced9b46ed7ad110246024d229b76327e9169de4 Mon Sep 17 00:00:00 2001 From: Kirill Motkov Date: Tue, 12 Mar 2019 16:16:26 +0300 Subject: [PATCH] Rewrite some if-else-if-else chains as a switch --- gen/generator.go | 7 ++++--- jlexer/lexer.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gen/generator.go b/gen/generator.go index a34a852..13c54c4 100644 --- a/gen/generator.go +++ b/gen/generator.go @@ -427,9 +427,10 @@ func lowerFirst(s string) string { for i := range s { ch := s[i] if isUpper(ch) { - if i == 0 { + switch { + case i == 0: str += string(ch + 32) - } else if !foundLower { // Currently just a stream of capitals, eg JSONRESTS[erver] + case !foundLower: // Currently just a stream of capitals, eg JSONRESTS[erver] if strlen > (i+1) && isLower(s[i+1]) { // Next char is lower, keep this a capital str += string(ch) @@ -437,7 +438,7 @@ func lowerFirst(s string) string { // Either at end of string or next char is capital str += string(ch + 32) } - } else { + default: str += string(ch) } } else { diff --git a/jlexer/lexer.go b/jlexer/lexer.go index 51f0566..ef64075 100644 --- a/jlexer/lexer.go +++ b/jlexer/lexer.go @@ -521,11 +521,12 @@ func (r *Lexer) SkipRecursive() { r.scanToken() var start, end byte - if r.token.delimValue == '{' { + switch r.token.delimValue { + case '{': start, end = '{', '}' - } else if r.token.delimValue == '[' { + case '[': start, end = '[', ']' - } else { + default: r.consume() return }