summaryrefslogtreecommitdiff
path: root/kconfiglib.py
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2015-06-05 07:03:41 +0200
committerUlf Magnusson <ulfalizer@gmail.com>2015-06-05 07:03:58 +0200
commit8d05539463f99ffb4d1b788df971ce0ff6d223bd (patch)
treedcdeb4b18793395fabb966d77f0a9f7e392854ee /kconfiglib.py
parentfffe6c4826ff750b7d5c24a8169eb50305d835ff (diff)
Revert "_parse_block() style nit."
Ops... this breaks menu ordering.
Diffstat (limited to 'kconfiglib.py')
-rw-r--r--kconfiglib.py12
1 files changed, 6 insertions, 6 deletions
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