diff options
| author | Christoph Behle <behlec@gmail.com> | 2018-06-11 19:57:34 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-12 00:14:54 +0000 |
| commit | 47c3a26915ffa12b3a9a14a3da485c1a0d5ab32c (patch) | |
| tree | 3c77986bf00f65a5fe2a0b91c44ece0bd96a69d8 | |
| parent | b19b714f374f7bbf9fe049ff7239f25d3ec5b108 (diff) | |
| download | meson-47c3a26915ffa12b3a9a14a3da485c1a0d5ab32c.tar.gz | |
Always apply concatenate_string_literal.
get_define always applies concatenate_string_literal to its result.
Remove kwarg concatenate_string_literal from get_define.
| -rw-r--r-- | mesonbuild/compilers/c.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 4 | ||||
| -rw-r--r-- | test cases/common/140 get define/meson.build | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index e34779bf8..ef67e0327 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -569,7 +569,7 @@ class CCompiler(Compiler): # Get the preprocessed value after the delimiter, # minus the extra newline at the end and # merge string literals. - return p.stdo.split(delim + '\n')[-1][:-1] + return CCompiler.concatenate_string_literals(p.stdo.split(delim + '\n')[-1][:-1]) def get_return_value(self, fname, rtype, prefix, env, extra_args, dependencies): if rtype == 'string': diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index e4ba63c89..421ddd950 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1174,7 +1174,6 @@ class CompilerHolder(InterpreterObject): 'include_directories', 'args', 'dependencies', - 'concatenate_string_literals', }) def get_define_method(self, args, kwargs): if len(args) != 1: @@ -1182,15 +1181,12 @@ class CompilerHolder(InterpreterObject): check_stringlist(args) element = args[0] prefix = kwargs.get('prefix', '') - concatenate = kwargs.pop('concatenate_string_literals', False) if not isinstance(prefix, str): raise InterpreterException('Prefix argument of get_define() must be a string.') extra_args = self.determine_args(kwargs) deps = self.determine_dependencies(kwargs) value = self.compiler.get_define(element, prefix, self.environment, extra_args, deps) mlog.log('Fetching value of define "%s": %s' % (element, value)) - if concatenate: - value = self.compiler.concatenate_string_literals(value) return value @permittedKwargs({ diff --git a/test cases/common/140 get define/meson.build b/test cases/common/140 get define/meson.build index 6d7cbfa4b..b20c55402 100644 --- a/test cases/common/140 get define/meson.build +++ b/test cases/common/140 get define/meson.build @@ -82,7 +82,7 @@ foreach lang : ['c', 'cpp'] endif have = cc.get_define('TEST_VERSION_STR', - prefix : '#include <concat.h>', include_directories: include_directories('.'), concatenate_string_literals: true) + prefix : '#include <concat.h>', include_directories: include_directories('.')) assert(have == '"6.0.0"', 'TEST_VERSION_STR value is "@0@" instead of ""6.0.0""'.format(have)) concat_examples = { @@ -95,7 +95,7 @@ foreach lang : ['c', 'cpp'] } foreach def,expected : concat_examples have = cc.get_define(def, - prefix : '#include <concat.h>', include_directories: include_directories('.'), concatenate_string_literals: true) + prefix : '#include <concat.h>', include_directories: include_directories('.')) assert(have == expected, '@0@ value is "@1@" instead of "@2@"'.format(def, have, expected)) endforeach endforeach |