]> Cypherpunks repositories - gostls13.git/commitdiff
text/template: ensures code consistency in lexer
authorAymerick <aymerick@jehanne.org>
Wed, 29 Apr 2015 09:33:41 +0000 (11:33 +0200)
committerRob Pike <r@golang.org>
Mon, 4 May 2015 17:27:03 +0000 (17:27 +0000)
At the end of lexInsideAction(), we return lexInsideAction: this is the default
behaviour when we are still parsing an action. But some switch branches return
lexInsideAction too.

So let's ensure code consistency by always reaching the end of the
lexInsideAction function when needed.

Change-Id: I7e9d8d6e51f29ecd6db6bdd63b36017845d95368
Reviewed-on: https://go-review.googlesource.com/9441
Reviewed-by: Rob Pike <r@golang.org>
src/text/template/parse/lex.go

index b829b7e3b444cb39c018b535cf9561486385bfd2..fe77b3afbebde97d555e16cfb7c6b6338470e3e2 100644 (file)
@@ -313,14 +313,12 @@ func lexInsideAction(l *lexer) stateFn {
        case r == '(':
                l.emit(itemLeftParen)
                l.parenDepth++
-               return lexInsideAction
        case r == ')':
                l.emit(itemRightParen)
                l.parenDepth--
                if l.parenDepth < 0 {
                        return l.errorf("unexpected right paren %#U", r)
                }
-               return lexInsideAction
        case r <= unicode.MaxASCII && unicode.IsPrint(r):
                l.emit(itemChar)
                return lexInsideAction