From 8d05539463f99ffb4d1b788df971ce0ff6d223bd Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Fri, 5 Jun 2015 07:03:41 +0200 Subject: Revert "_parse_block() style nit." Ops... this breaks menu ordering. --- kconfiglib.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kconfiglib.py') diff --git a/kconfiglib.py b/kconfiglib.py index 1ff93d0..392148c 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -1013,13 +1013,13 @@ class Config(object): elif t0 == T_COMMENT: comment = Comment() - comment.config = self comment.parent = parent + comment.filename = filename comment.linenr = linenr - comment.text = tokens.get_next() + comment.text = tokens.get_next() self._parse_properties(line_feeder, comment, deps, visible_if_deps) block.add_item(comment) @@ -1027,12 +1027,13 @@ class Config(object): elif t0 == T_MENU: menu = Menu() - + self.menus.append(menu) menu.config = self menu.parent = parent + menu.title = tokens.get_next() + menu.filename = filename menu.linenr = linenr - menu.title = tokens.get_next() # Parse properties and contents self._parse_properties(line_feeder, menu, deps, visible_if_deps) @@ -1044,8 +1045,6 @@ class Config(object): menu.visible_if_expr)) block.add_item(menu) - self.menus.append(menu) - elif t0 == T_CHOICE: # We support named choices @@ -1066,6 +1065,7 @@ class Config(object): choice.config = self choice.parent = parent + choice.def_locations.append((filename, linenr)) # Parse properties and contents -- cgit v1.2.3