Fix string format recursive replace

Also error on placeholder index out of range.

2 files changed, 12 insertions, 3 deletions

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 3e89305..f112d7b 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -2999,12 +2999,19 @@ different subdirectory.
     def format_string(self, templ, args):
         if isinstance(args, mparser.ArgumentNode):
             args = args.arguments
-        for (i, arg) in enumerate(args):
+        arg_strings = []
+        for arg in args:
             arg = self.evaluate_statement(arg)
             if isinstance(arg, bool): # Python boolean is upper case.
                 arg = str(arg).lower()
-            templ = templ.replace('@{}@'.format(i), str(arg))
-        return templ
+            arg_strings.append(str(arg))
+
+        def arg_replace(match):
+            idx = int(match.group(1))
+            if idx >= len(arg_strings):
+                raise InterpreterException('Format placeholder @{}@ out of range.'.format(idx))
+            return arg_strings[idx]
+        return re.sub(r'@(\d+)@', arg_replace, templ)
 
     # Only permit object extraction from the same subproject
     def validate_extraction(self, buildtarget):
diff --git a/test cases/common/42 string operations/meson.build b/test cases/common/42 string operations/meson.build
index e60006a..a43de70 100644
--- a/test cases/common/42 string operations/meson.build
+++ b/test cases/common/42 string operations/meson.build
@@ -13,6 +13,8 @@ subs2 = '42'
 
 assert(templ2.format(subs2) == '42', 'String formatting with variables is broken.')
 
+assert('@@0@@ @@1@@'.format(1, 2) == '@1@ @2@', 'String format is recursive.')
+
 long = 'abcde'
 prefix = 'abc'
 suffix = 'cde'