[kernel-team] 49/86: Cleanup menu reading.

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch benh/kconfigeditor2
in repository kernel-team.

commit 6fad6ade93e96cfd5413d05140aaf3f9dca72f00
Author: Bastian Blank <waldi at debian.org>
Date:   Tue Mar 17 19:22:12 2009 +0000

    Cleanup menu reading.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=13162
---
 utils/kconfigeditor2/bin/process.py                |  4 +-
 .../lib/kconfigeditor/kconfig/menu/all.py          | 44 ++++++++++++----------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/utils/kconfigeditor2/bin/process.py b/utils/kconfigeditor2/bin/process.py
index b966284..3d7c5a3 100755
--- a/utils/kconfigeditor2/bin/process.py
+++ b/utils/kconfigeditor2/bin/process.py
@@ -12,9 +12,9 @@ def main(package, source, config_output, ignore_silent):
     for filename, data in package.items():
         kernelarch = data['kernelarch']
         if kernelarch:
-            menufiles = menu.files_arch[kernelarch].itervalues()
+            menufiles = menu.arch(kernelarch)
         else:
-            menufiles = menu.files_all.itervalues()
+            menufiles = menu
 
         filename = os.path.join(config_output, filename)
         filename_tmp = filename + '.tmp'
diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
index 5e25a4c..044fe75 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
@@ -5,41 +5,47 @@ import os
 from . import MenuEntrySource
 from .file import Parser
 
+
 class All(object):
     def __init__(self, root, arches):
-        self.files = {}
-        self.filenames_all = []
-        self.filenames_arch = {}
+        self.root = root
+
+        self._files = {}
+        self._filenames = set()
+        self._filenames_arch = {}
 
         for arch in arches:
+            self._filenames_arch[arch] = set()
+
             work = ["arch/%s/Kconfig" % arch]
-            self.filenames_arch[arch] = []
 
             while work:
                 filename = work.pop(0)
                 filename_list = filename.split('/')
 
-                self.filenames_arch[arch].append(filename)
-                if not (filename_list[0] == 'arch' or filename_list[0] == 'drivers' and filename_list[1] in arches):
-                    self.filenames_all.append(filename)
+                if filename_list[0] == 'arch' or filename_list[0] == 'drivers' and filename_list[1] in arches:
+                    self._filenames_arch[arch].add(filename)
+                else:
+                    self._filenames.add(filename)
 
-                if filename in self.files:
-                    f = self.files[filename]
+                if filename in self._files:
+                    f = self._files[filename]
                 else:
-                    f = self.files.setdefault(filename, Parser()(file(os.path.join(root, filename)), filename))
+                    f = self._files.setdefault(filename, self.read(filename))
 
                 for i in f:
                     if isinstance(i, MenuEntrySource):
                         work.append(i.filename)
 
-        self.files_all = {}
-        for i in self.filenames_all:
-            self.files_all[i] = self.files[i]
+    def __iter__(self):
+        for filename in self._filenames:
+            yield self._files[filename]
 
-        self.files_arch = {}
-        for arch in arches:
-            f = {}
-            for i in self.filenames_arch[arch]:
-                f[i] = self.files[i]
-            self.files_arch[arch] = f
+    def arch(self, arch):
+        for filename in self._filenames_arch[arch]:
+            yield self._files[filename]
+        for filename in self._filenames:
+            yield self._files[filename]
 
+    def read(self, filename):
+         return Parser()(file(os.path.join(self.root, filename)), filename)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kernel-team.git