From c054d89015a3fb600332de1590594d7eae539f32 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Tue, 16 Jan 2018 13:52:37 +0100 Subject: Reset _tokens_i just once in _tokenize() It's set to -1 in every return path, so we can just do it at the beginning instead. --- kconfiglib.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'kconfiglib.py') diff --git a/kconfiglib.py b/kconfiglib.py index 8eea9cf..f92c955 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -1223,23 +1223,23 @@ class Kconfig(object): """ s = self._line - # Tricky implementation detail: While parsing a token, 'token' refers - # to the previous token. See _STRING_LEX for why this is needed. + # Token index (minus one). Set for later -- not further updated here. + self._tokens_i = -1 # See comment at _initial_token_re_match definition initial_token_match = _initial_token_re_match(s) if not initial_token_match: self._tokens = (None,) - self._tokens_i = -1 return + # Tricky implementation detail: While parsing a token, 'token' refers + # to the previous token. See _STRING_LEX for why this is needed. token = _get_keyword(initial_token_match.group(1)) if token == _T_HELP: # Avoid junk after "help", e.g. "---", being registered as a # symbol self._tokens = (token, None) - self._tokens_i = -1 return if token is None: @@ -1419,7 +1419,6 @@ class Kconfig(object): # None-terminating token streams makes the token fetching functions # simpler/faster self._tokens.append(None) - self._tokens_i = -1 def _next_token(self): self._tokens_i += 1 -- cgit v1.2.3