diff options
author | Chris Larson <chris_larson@mentor.com> | 2011-01-04 13:07:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-06 10:49:29 +0000 |
commit | 37391f667f0ccb47740243de77e14d60b0797280 (patch) | |
tree | 23a44f040ea197b55f34d8a5ed16847c28376b1e /bitbake/lib/bb/parse | |
parent | 1204ed79fce14115b802012772be8cf8aedff781 (diff) | |
download | poky-37391f667f0ccb47740243de77e14d60b0797280.tar.gz |
parse.ast: drop __word__ regular expression
We can use the string split method for this instead.
(Bitbake rev: aa9646717b3ee1006628246a7c495f601e62391c)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index fe2674d432..e34f1fe894 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -31,7 +31,6 @@ import itertools | |||
31 | from bb import methodpool | 31 | from bb import methodpool |
32 | from bb.parse import logger | 32 | from bb.parse import logger |
33 | 33 | ||
34 | __word__ = re.compile(r"\S+") | ||
35 | __parsed_methods__ = bb.methodpool.get_parsed_dict() | 34 | __parsed_methods__ = bb.methodpool.get_parsed_dict() |
36 | _bbversions_re = re.compile(r"\[(?P<from>[0-9]+)-(?P<to>[0-9]+)\]") | 35 | _bbversions_re = re.compile(r"\[(?P<from>[0-9]+)-(?P<to>[0-9]+)\]") |
37 | 36 | ||
@@ -180,7 +179,7 @@ class MethodFlagsNode(AstNode): | |||
180 | 179 | ||
181 | class ExportFuncsNode(AstNode): | 180 | class ExportFuncsNode(AstNode): |
182 | def __init__(self, fns, classes): | 181 | def __init__(self, fns, classes): |
183 | self.n = __word__.findall(fns) | 182 | self.n = fns.split() |
184 | self.classes = classes | 183 | self.classes = classes |
185 | 184 | ||
186 | def eval(self, data): | 185 | def eval(self, data): |
@@ -250,7 +249,7 @@ class AddTaskNode(AstNode): | |||
250 | 249 | ||
251 | class BBHandlerNode(AstNode): | 250 | class BBHandlerNode(AstNode): |
252 | def __init__(self, fns): | 251 | def __init__(self, fns): |
253 | self.hs = __word__.findall(fns) | 252 | self.hs = fns.split() |
254 | 253 | ||
255 | def eval(self, data): | 254 | def eval(self, data): |
256 | bbhands = bb.data.getVar('__BBHANDLERS', data) or [] | 255 | bbhands = bb.data.getVar('__BBHANDLERS', data) or [] |
@@ -301,7 +300,7 @@ def handleBBHandlers(statements, m): | |||
301 | 300 | ||
302 | def handleInherit(statements, m): | 301 | def handleInherit(statements, m): |
303 | classes = m.group(1) | 302 | classes = m.group(1) |
304 | statements.append(InheritNode(__word__.findall(classes))) | 303 | statements.append(InheritNode(classes.split())) |
305 | 304 | ||
306 | def finalize(fn, d, variant = None): | 305 | def finalize(fn, d, variant = None): |
307 | for lazykey in bb.data.getVar("__lazy_assigned", d) or (): | 306 | for lazykey in bb.data.getVar("__lazy_assigned", d) or (): |