Modify using to indicate which type it is

virtuald · virtuald · commit 795c22385e33 · 2020-01-03T16:22:23.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -3193,6 +3193,8 @@ def _evaluate_stack(self, token=None):
 
                     # namespace refers to the embedded type
                     atype["namespace"] = ns
+                    atype["using_type"] = "typealias"
+                    atype["typealias"] = alias
                 else:
                     # using foo::bar
                     # -> in global scope this is bringing in something
@@ -3204,6 +3206,7 @@ def _evaluate_stack(self, token=None):
                         stack, self._get_stmt_doxygen(), self._get_location(stack)
                     )
                     alias = atype["type"]
+                    atype["using_type"] = "declaration"
                     if self.curClass:
                         atype["baseclass"] = ns
                     else:
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -2782,6 +2782,7 @@ def setUp(self):
         self.cppHeader = CppHeaderParser.CppHeader(
             """
 using std::thing;
+using MyThing = SomeThing;
 namespace a {
     using std::string;
     using VoidFunction = std::function<void()>;
@@ -2801,10 +2802,77 @@ class A : public B {
         )
 
     def test_using(self):
-        self.assertEqual(len(self.cppHeader.using), 3)
-        self.assertIn("a::string", self.cppHeader.using)
-        self.assertIn("a::VoidFunction", self.cppHeader.using)
-        self.assertIn("thing", self.cppHeader.using)
+        self.assertEqual(len(self.cppHeader.using), 4)
+
+        self.assertEqual(
+            filter_pameters(
+                [self.cppHeader.using["a::string"]],
+                extra=["using_type", "raw_type", "namespace"],
+            ),
+            [
+                {
+                    "desc": None,
+                    "name": "",
+                    "namespace": "std::",
+                    "raw_type": "std::string",
+                    "type": "string",
+                    "using_type": "declaration",
+                }
+            ],
+        )
+
+        self.assertEqual(
+            filter_pameters(
+                [self.cppHeader.using["a::VoidFunction"]],
+                extra=["using_type", "raw_type", "namespace", "typealias"],
+            ),
+            [
+                {
+                    "desc": None,
+                    "name": "",
+                    "namespace": "std::",
+                    "raw_type": "std::function<void ( )>",
+                    "type": "function<void ( )>",
+                    "typealias": "VoidFunction",
+                    "using_type": "typealias",
+                }
+            ],
+        )
+
+        self.assertEqual(
+            filter_pameters(
+                [self.cppHeader.using["thing"]],
+                extra=["using_type", "raw_type", "namespace"],
+            ),
+            [
+                {
+                    "desc": None,
+                    "name": "",
+                    "namespace": "std::",
+                    "raw_type": "std::thing",
+                    "type": "thing",
+                    "using_type": "declaration",
+                }
+            ],
+        )
+
+        self.assertEqual(
+            filter_pameters(
+                [self.cppHeader.using["MyThing"]],
+                extra=["using_type", "raw_type", "namespace", "typealias"],
+            ),
+            [
+                {
+                    "desc": None,
+                    "name": "",
+                    "namespace": "",
+                    "raw_type": "SomeThing",
+                    "type": "SomeThing",
+                    "typealias": "MyThing",
+                    "using_type": "typealias",
+                }
+            ],
+        )
 
     def test_fn(self):
         self.assertEqual(len(self.cppHeader.functions), 1)
