diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-19 00:08:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-19 00:08:58 +0200 |
commit | 6e15bcc5045b6092a27b83e402007c9beca27abb (patch) | |
tree | 72521f7d1a5099cb7d6f0d20f65bbb27166b219c /mesonbuild/mparser.py | |
parent | a9e63568fe4a1ef420cdb8bacb85fbf6d621dc0d (diff) | |
parent | 4b7b5a718550808f9880f864126120cbbadf40ea (diff) | |
download | meson-6e15bcc5045b6092a27b83e402007c9beca27abb.zip meson-6e15bcc5045b6092a27b83e402007c9beca27abb.tar.gz meson-6e15bcc5045b6092a27b83e402007c9beca27abb.tar.bz2 |
Merge pull request #4929 from mensinda/rwAddRmTgt
rewriter: Add and remove targets
Diffstat (limited to 'mesonbuild/mparser.py')
-rw-r--r-- | mesonbuild/mparser.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py index ed0dc1b..f18352b 100644 --- a/mesonbuild/mparser.py +++ b/mesonbuild/mparser.py @@ -358,7 +358,8 @@ class FunctionNode(BaseNode): self.args = args class AssignmentNode(BaseNode): - def __init__(self, lineno, colno, var_name, value): + def __init__(self, subdir, lineno, colno, var_name, value): + self.subdir = subdir self.lineno = lineno self.colno = colno self.var_name = var_name @@ -366,7 +367,8 @@ class AssignmentNode(BaseNode): self.value = value class PlusAssignmentNode(BaseNode): - def __init__(self, lineno, colno, var_name, value): + def __init__(self, subdir, lineno, colno, var_name, value): + self.subdir = subdir self.lineno = lineno self.colno = colno self.var_name = var_name @@ -522,13 +524,13 @@ class Parser: value = self.e1() if not isinstance(left, IdNode): raise ParseException('Plusassignment target must be an id.', self.getline(), left.lineno, left.colno) - return PlusAssignmentNode(left.lineno, left.colno, left.value, value) + return PlusAssignmentNode(left.subdir, left.lineno, left.colno, left.value, value) elif self.accept('assign'): value = self.e1() if not isinstance(left, IdNode): raise ParseException('Assignment target must be an id.', self.getline(), left.lineno, left.colno) - return AssignmentNode(left.lineno, left.colno, left.value, value) + return AssignmentNode(left.subdir, left.lineno, left.colno, left.value, value) elif self.accept('questionmark'): if self.in_ternary: raise ParseException('Nested ternary operators are not allowed.', |