aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-02-26 21:07:09 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-07-17 19:20:00 +0300
commitf78cf53141a1da1a35fb02324a154f371c488141 (patch)
treea10a2b6f0d9bffe5765c0b7f146ba0af26868a42 /mesonbuild/interpreter.py
parent6119beed4db77529830e466f581591c86e32e0d0 (diff)
downloadmeson-f78cf53141a1da1a35fb02324a154f371c488141.zip
meson-f78cf53141a1da1a35fb02324a154f371c488141.tar.gz
meson-f78cf53141a1da1a35fb02324a154f371c488141.tar.bz2
Created merge_from method for ConfigurationData.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 63cdf9e..43ddd72 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -161,6 +161,7 @@ class ConfigurationDataHolder(MutableInterpreterObject):
'set_quoted': self.set_quoted_method,
'has': self.has_method,
'get': self.get_method,
+ 'merge_from': self.merge_from_method,
})
def is_used(self):
@@ -221,6 +222,16 @@ class ConfigurationDataHolder(MutableInterpreterObject):
def keys(self):
return self.held_object.values.keys()
+ def merge_from_method(self, args, kwargs):
+ if len(args) != 1:
+ raise InterpreterException('Merge_from takes one positional argument.')
+ from_object = args[0]
+ if not isinstance(from_object, ConfigurationDataHolder):
+ raise InterpreterException('Merge_from argument must be a configuration data object.')
+ from_object = from_object.held_object
+ for k, v in from_object.values.items():
+ self.held_object.values[k] = v
+
# Interpreter objects can not be pickled so we must have
# these wrappers.