diff options
author | Iñigo MartÃnez <inigomartinez@gmail.com> | 2017-11-23 23:00:15 +0100 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-26 17:14:32 +0200 |
commit | 3d0a9b791175b3be4ebf6834c08d2cc3be5a1903 (patch) | |
tree | ba01f1bf6ed1e793d9ad036127d8852672b1e58d | |
parent | 30f2c4857c4798565a3f0d0b370b630335eb4687 (diff) | |
download | meson-3d0a9b791175b3be4ebf6834c08d2cc3be5a1903.zip meson-3d0a9b791175b3be4ebf6834c08d2cc3be5a1903.tar.gz meson-3d0a9b791175b3be4ebf6834c08d2cc3be5a1903.tar.bz2 |
interpreter: Reduce to_sring method to base 10
The int's to_string method implementation has been reduced to base
10.
-rw-r--r-- | mesonbuild/interpreterbase.py | 7 | ||||
-rw-r--r-- | test cases/common/165 int formatting/meson.build | 15 |
2 files changed, 1 insertions, 21 deletions
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py index 9bb311f..7ccc8b2 100644 --- a/mesonbuild/interpreterbase.py +++ b/mesonbuild/interpreterbase.py @@ -452,13 +452,8 @@ class InterpreterBase: elif method_name == 'to_string': if not posargs: return str(obj) - elif len(posargs) == 1 and isinstance(posargs[0], str): - f = 'd' if len(posargs[0].strip()) == 0 else posargs[0] - if re.match('^[bcdoxX]$', f) is None: - raise InvalidCode('Invalid format for int to string conversion "%s"' % f) - return str(('{:' + f + '}').format(obj)) else: - raise InterpreterException('int.to_string() must have either no arguments or exactly one string arguments that signify what format to use.') + raise InterpreterException('int.to_string() must have no arguments.') else: raise InterpreterException('Unknown method "%s" for an integer.' % method_name) diff --git a/test cases/common/165 int formatting/meson.build b/test cases/common/165 int formatting/meson.build deleted file mode 100644 index ea9923b..0000000 --- a/test cases/common/165 int formatting/meson.build +++ /dev/null @@ -1,15 +0,0 @@ -project('int formatting', 'c') - -values = [ - ['', '74'], - ['c', 'J'], - ['b', '1001010'], - ['d', '74'], - ['o', '112'], - ['x', '4a'], - ['X', '4A'] -] - -foreach value: values - assert(74.to_string(value[0]) == value[1], 'conversion is broken') -endforeach |