Fixed error message printing in write_cmake_config.py

[gribozavr]

Summary

Previously, write_cmake_config.py would raise an error while printing
the error, because leftovers in "'\n'.join(leftovers)" is a tuple.

[phosek]

LGTM

[thakis]

llvm/trunk/utils/gn/build/write_cmake_config.py

102

Huh, did you actually hit this? I always thought this branch is effectively dead code after a refactoring: in_lien = var_re.sub(repl, in_line) should call repl() on all matches on each line, and if some pattern doesn't have a value in the values dict, then return values[key] will throw. I always wanted to make that set a bool instead and then print this error based on that bool, and remove the findall call down here (since I thought I shouldn't happen), but didn't get around to it yet.

[thakis]

llvm/trunk/utils/gn/build/write_cmake_config.py

102

From IRC, the way to hit this is by invoking a variable whose substitution is a variable reference: llvm/utils/gn/build/write_cmake_config.py -o foo llvm/include/llvm/Config/AsmParsers.def.in 'LLVM_ENUM_ASM_PARSERS=@LLVM_ENUM_ASM_PARSERS@'

llvm/trunk/utils/gn/build/write_cmake_config.py

if unused_values:
         print('unused values args:', file=sys.stderr)
         print('    ' + '\n    '.join(unused_values), file=sys.stderr)
         return 1
 
     output = ''.join(out_lines)
 
     leftovers = var_re.findall(output)
     if leftovers:
-        print('unprocessed values:\n', '\n'.join(leftovers), file=sys.stderr)
+        print(
+            'unprocessed values:\n',
+            '\n'.join([x[0] or x[1] for x in leftovers]),
+            file=sys.stderr)
         return 1
 
     if not os.path.exists(args.output) or open(args.output).read() != output:
         open(args.output, 'w').write(output)
         os.chmod(args.output, os.stat(args.input).st_mode & 0o777)
 
 
 if __name__ == '__main__':
     sys.exit(main())