summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2011-01-04 13:06:49 -0700
committerChris Larson <chris_larson@mentor.com>2011-01-05 11:22:38 -0700
commit0b11a3d4eab84b372fd45b9537cf0327008daf8d (patch)
tree1e1eaae0c70b4a8e63b9ae0ed02203d626681cc2 /lib
parent01f582992f64dc77d54df0312b9eecb566821f16 (diff)
downloadbitbake-0b11a3d4eab84b372fd45b9537cf0327008daf8d.tar.gz
parse.ast: avoid code duplication for inherit
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/bb/parse/ast.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py
index 8cc166b02..bb42f2398 100644
--- a/lib/bb/parse/ast.py
+++ b/lib/bb/parse/ast.py
@@ -256,11 +256,11 @@ class BBHandlerNode(AstNode):
bb.data.setVar('__BBHANDLERS', bbhands, data)
class InheritNode(AstNode):
- def __init__(self, files):
- self.n = __word__.findall(files)
+ def __init__(self, classes):
+ self.classes = classes
def eval(self, data):
- bb.parse.BBHandler.inherit(self.n, data)
+ bb.parse.BBHandler.inherit(self.classes, data)
def handleInclude(statements, m, fn, lineno, force):
statements.append(IncludeNode(m.group(1), fn, lineno, force))
@@ -296,9 +296,8 @@ def handleBBHandlers(statements, m):
statements.append(BBHandlerNode(m.group(1)))
def handleInherit(statements, m):
- files = m.group(1)
- n = __word__.findall(files)
- statements.append(InheritNode(m.group(1)))
+ classes = m.group(1)
+ statements.append(InheritNode(__word__.findall(classes)))
def finalize(fn, d):
for lazykey in bb.data.getVar("__lazy_assigned", d) or ():