Parse symbols with qualified name

Author: vvd170501

clang/tools/include-mapping/cppreference_parser.py

@@ -40,7 +40,7 @@ def _HasClass(tag, *classes):
     return False
 
 
-def _ParseSymbolPage(symbol_page_html, symbol_name):
+def _ParseSymbolPage(symbol_page_html, symbol_name, qual_name):
     """Parse symbol page and retrieve the include header defined in this page.
     The symbol page provides header for the symbol, specifically in
     "Defined in header <header>" section. An example:
@@ -69,7 +69,9 @@ def _ParseSymbolPage(symbol_page_html, symbol_name):
                 was_decl = True
                 # Symbols are in the first cell.
                 found_symbols = row.find("td").stripped_strings
-                if not symbol_name in found_symbols:
+                if not any(
+                    sym == symbol_name or sym == qual_name for sym in found_symbols
+                ):
                     continue
                 headers.update(current_headers)
             elif _HasClass(row, "t-dsc-header"):
@@ -93,19 +95,18 @@ def _ParseSymbolVariant(caption):
     if not (isinstance(caption, NavigableString) and "(" in caption):
         return None
 
-    if ')' in caption.text:  # (locale), (algorithm), etc.
+    if ")" in caption.text:  # (locale), (algorithm), etc.
         return caption.text.strip(" ()")
 
     second_part = caption.next_sibling
     if isinstance(second_part, Tag) and second_part.name == "code":
         # (<code>std::complex</code>), etc.
         third_part = second_part.next_sibling
-        if isinstance(third_part, NavigableString) and third_part.text.startswith(')'):
+        if isinstance(third_part, NavigableString) and third_part.text.startswith(")"):
             return second_part.text
     return None
 
 
-
 def _ParseIndexPage(index_page_html):
     """Parse index page.
     The index page lists all std symbols and hrefs to their detailed pages
@@ -137,9 +138,9 @@ def _ParseIndexPage(index_page_html):
     return symbols
 
 
-def _ReadSymbolPage(path, name):
+def _ReadSymbolPage(path, name, qual_name):
     with open(path) as f:
-        return _ParseSymbolPage(f.read(), name)
+        return _ParseSymbolPage(f.read(), name, qual_name)
 
 
 def _GetSymbols(pool, root_dir, index_page_name, namespace, variants_to_accept):
@@ -161,17 +162,18 @@ def _GetSymbols(pool, root_dir, index_page_name, namespace, variants_to_accept):
         for symbol_name, symbol_page_path, variant in _ParseIndexPage(f.read()):
             # Variant symbols (e.g. the std::locale version of isalpha) add ambiguity.
             # FIXME: use these as a fallback rather than ignoring entirely.
-            variants_for_symbol = variants_to_accept.get(
-                (namespace or "") + symbol_name, ()
-            )
+            qualified_symbol_name = (namespace or "") + symbol_name
+            variants_for_symbol = variants_to_accept.get(qualified_symbol_name, ())
             if variant and variant not in variants_for_symbol:
                 continue
             path = os.path.join(root_dir, symbol_page_path)
             if os.path.isfile(path):
                 results.append(
                     (
                         symbol_name,
-                        pool.apply_async(_ReadSymbolPage, (path, symbol_name)),
+                        pool.apply_async(
+                            _ReadSymbolPage, (path, symbol_name, qualified_symbol_name)
+                        ),
                     )
                 )
             else: