From b5c719b72320b655b448cfd91feb5eee5eadebd7 Mon Sep 17 00:00:00 2001
From: Ulf Magnusson <ulfalizer@gmail.com>
Date: Mon, 2 Jul 2018 00:48:45 +0200
Subject: Tighten up named choice parsing

Things like 'choice NAMED_CHOICE oops extra tokens' and 'choice &&' are
now detected as syntax errors.

Bit faster too, though it doesn't matter here.
---
 kconfiglib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kconfiglib.py b/kconfiglib.py
index b851a40..b5a878e 100644
--- a/kconfiglib.py
+++ b/kconfiglib.py
@@ -2029,14 +2029,14 @@ class Kconfig(object):
                 prev.next = prev = node
 
             elif t0 == _T_CHOICE:
-                name = self._next_token()
-                if name is None:
+                if self._peek_token() is None:
                     choice = Choice()
                     choice.direct_dep = self.n
 
                     self.choices.append(choice)
                 else:
                     # Named choice
+                    name = self._expect_str_and_eol()
                     choice = self.named_choices.get(name)
                     if not choice:
                         choice = Choice()
-- 
cgit v1.2.3