[kernel] r22941 - people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu

[Ben Hutchings]

Author: benh
Date: Tue Aug 11 15:41:19 2015
New Revision: 22941

Log:
kconfigeditor2: Fix processing of 'source' inside 'choice'

Currently kconfigeditor.kconfig.menu.all.All assumes the parser will put
all MenuEntrySource elements directly under the parse root.  However,
they may also be placed under a MenuEntryChoice.  There is one instance
where this occurs in current linux sources, in
drivers/usb/gadget/Kconfig.

Handle this special case when parsing MenuEntryChoice.

Modified:
   people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py

Modified: people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
==============================================================================
--- people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py	Tue Aug 11 15:39:29 2015	(r22940)
+++ people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py	Tue Aug 11 15:41:19 2015	(r22941)
@@ -182,6 +182,7 @@
         super(_BlockChoice, self).__init__(parent)
         self.entry = MenuEntryChoice()
         parent.entry.append(self.entry)
+        self._parent = parent
         _BlockConfigData(self, self.entry)
 
     def process_default(self, text, ind):
@@ -190,6 +191,10 @@
     def process_endchoice(self, text, ind):
         self.pop()
 
+    def process_source(self, text, ind):
+        # Push source statements up to the parent
+        self._parent.process_source(text, ind)
+
 class _BlockComment(_BlockObject, _BlockContainerDepends):
     pass