rewriter: fix kwargs info for dict-valued kwargs

We can't modify dict-valued kwargs (#14739) but this lets us at least read
them.

Author: bgilbert

mesonbuild/rewriter.py

@@ -16,7 +16,7 @@
 from mesonbuild.mesonlib import MesonException, setup_vsenv, relpath
 from . import mlog, environment
 from functools import wraps
-from .mparser import Token, ArrayNode, ArgumentNode, ArithmeticNode, AssignmentNode, BaseNode, StringNode, BooleanNode, ElementaryNode, IdNode, FunctionNode, PlusAssignmentNode
+from .mparser import Token, ArrayNode, ArgumentNode, ArithmeticNode, AssignmentNode, BaseNode, StringNode, BooleanNode, DictNode, ElementaryNode, IdNode, FunctionNode, PlusAssignmentNode
 from .mintro import IntrospectionEncoder
 import json, os, re, sys, codecs
 import typing as T
@@ -569,6 +569,16 @@ def process_kwargs(self, cmd: T.Dict[str, T.Any]) -> None:
                             element = i.value
                         data_list += [element]
                     info_data[key] = data_list
+                elif isinstance(val, DictNode):
+                    data_dict = {}
+                    for k, v in val.args.kwargs.items():
+                        if not isinstance(k, StringNode):
+                            continue
+                        value = None
+                        if isinstance(v, ElementaryNode):
+                            value = v.value
+                        data_dict[k.value] = value
+                    info_data[key] = data_dict
 
             self.add_info('kwargs', '{}#{}'.format(cmd['function'], cmd['id']), info_data)
             return # Nothing else to do

test cases/rewrite/8 kwargs dict/info.json

@@ -0,0 +1,14 @@
+[
+  {
+    "type": "kwargs",
+    "function": "project",
+    "id": "/",
+    "operation": "info"
+  },
+  {
+    "type": "kwargs",
+    "function": "dependency",
+    "id": "dep1",
+    "operation": "info"
+  }
+]

test cases/rewrite/8 kwargs dict/meson.build

@@ -0,0 +1,10 @@
+project(
+  'rewritetest', 'cpp',
+  version: '0.0.1',
+  default_options: {
+    'c_std': 'c11',
+    'cpp_std': 'c++17',
+  },
+)
+
+dep1 = dependency('zlib', required: false, default_options: {'foo': 'bar'})

unittests/rewritetests.py

@@ -289,6 +289,23 @@ def test_kwargs_info(self):
         }
         self.assertDictEqual(out, expected)
 
+    def test_kwargs_info_dict(self):
+        self.prime('8 kwargs dict')
+        out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
+        expected = {
+            'kwargs': {
+                'project#/': {
+                    'default_options': {'c_std': 'c11', 'cpp_std': 'c++17'},
+                    'version': '0.0.1'
+                },
+                'dependency#dep1': {
+                    'default_options': {'foo': 'bar'},
+                    'required': False
+                }
+            }
+        }
+        self.assertDictEqual(out, expected)
+
     def test_kwargs_set(self):
         self.prime('3 kwargs')
         self.rewrite(self.builddir, os.path.join(self.builddir, 'set.json'))