summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-22 12:53:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-23 08:22:44 (GMT)
commitc8cce4e0d6c25e4ee85cf23790363905a188eef4 (patch)
tree820fb80062e12004f54a6919c74345abd77d9676 /bitbake/lib
parent43cbd5afceff490d4691dcc841f8b3aa7cfbcb87 (diff)
downloadpoky-c8cce4e0d6c25e4ee85cf23790363905a188eef4.tar.gz
bitbake: methodpool: Clean up the parsed module list handling to be slightly less insane
This removes some dubious functions and replaces them with a simpler, cleaner API which better describes what the code is doing. Unused code/variables are removed and comments tweaked. (Bitbake rev: f1e943aebfb84e98253f3f21646d6765c4fa1d66) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/methodpool.py17
-rw-r--r--bitbake/lib/bb/parse/ast.py1
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py2
3 files changed, 10 insertions, 10 deletions
diff --git a/bitbake/lib/bb/methodpool.py b/bitbake/lib/bb/methodpool.py
index 3b8e5c1..2fb5d96 100644
--- a/bitbake/lib/bb/methodpool.py
+++ b/bitbake/lib/bb/methodpool.py
@@ -33,9 +33,7 @@
33from bb.utils import better_compile, better_exec 33from bb.utils import better_compile, better_exec
34from bb import error 34from bb import error
35 35
36# A dict of modules we have handled 36# A dict of function names we have seen
37# it is the number of .bbclasses + x in size
38_parsed_methods = { }
39_parsed_fns = { } 37_parsed_fns = { }
40 38
41def insert_method(modulename, code, fn): 39def insert_method(modulename, code, fn):
@@ -56,15 +54,18 @@ def insert_method(modulename, code, fn):
56 else: 54 else:
57 _parsed_fns[name] = modulename 55 _parsed_fns[name] = modulename
58 56
57# A dict of modules the parser has finished with
58_parsed_methods = {}
59
59def parsed_module(modulename): 60def parsed_module(modulename):
60 """ 61 """
61 Inform me file xyz was parsed 62 Has module been parsed?
62 """ 63 """
63 return modulename in _parsed_methods 64 return modulename in _parsed_methods
64 65
65 66def set_parsed_module(modulename):
66def get_parsed_dict():
67 """ 67 """
68 shortcut 68 Set module as parsed
69 """ 69 """
70 return _parsed_methods 70 _parsed_methods[modulename] = True
71
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index b88d5f5..4d3a623 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -31,7 +31,6 @@ import itertools
31from bb import methodpool 31from bb import methodpool
32from bb.parse import logger 32from bb.parse import logger
33 33
34__parsed_methods__ = bb.methodpool.get_parsed_dict()
35_bbversions_re = re.compile(r"\[(?P<from>[0-9]+)-(?P<to>[0-9]+)\]") 34_bbversions_re = re.compile(r"\[(?P<from>[0-9]+)-(?P<to>[0-9]+)\]")
36 35
37class StatementGroup(list): 36class StatementGroup(list):
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 625a2a2..2e0647b 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -161,7 +161,7 @@ def handle(fn, d, include):
161 161
162 # we have parsed the bb class now 162 # we have parsed the bb class now
163 if ext == ".bbclass" or ext == ".inc": 163 if ext == ".bbclass" or ext == ".inc":
164 bb.methodpool.get_parsed_dict()[base_name] = 1 164 bb.methodpool.set_parsed_module(base_name)
165 165
166 return d 166 return d
167 167