Make the `fullname' field also match the demangled symbol name

* bdx/index.py (DatabaseField.key): Also accept a list of strings.
(Schema.__post_init__): Use all provided keys as handlers.
(SymbolIndex.SCHEMA): Modify `fullname' to also match `demangled'
attribute.
* tests/test_index.py (test_searching_by_exact_name_2): New test.

Author: mkcms

bdx/index.py

@@ -25,6 +25,7 @@
     List,
     Optional,
     Type,
+    Union,
 )
 
 import xapian
@@ -62,9 +63,9 @@ class DatabaseField:
     prefix: str
 
     # This DatabaseField will be responsible for indexing the
-    # following key/attribute of each document (Symbol) added to the
-    # index.
-    key: str
+    # following key(s)/attribute(s) of each document (Symbol) added to
+    # the index.
+    key: Union[str, list[str]]
 
     def index(self, document: xapian.Document, value: Any):
         """Index ``value`` in the ``document``."""
@@ -418,7 +419,11 @@ def __post_init__(self):
                 msg = f"'{db_field.name}' is duplicated in the schema"
                 raise ValueError(msg)
             self._field_dict[db_field.name] = db_field
-            self._handlers[db_field.key].append(db_field)
+            if isinstance(db_field.key, str):
+                self._handlers[db_field.key].append(db_field)
+            else:
+                for key in db_field.key:
+                    self._handlers[key].append(db_field)
 
     def __getitem__(self, key):
         if not self.fields:
@@ -470,7 +475,13 @@ def __iter__(self) -> Iterator[Symbol]:
             optional_field(
                 SymbolNameField("demangled", "XD", key="demangled")
             ),
-            DatabaseField("fullname", "XFN", key="name"),
+            optional_field(
+                # This field is optional as `demangled' attribute can
+                # be None.  In case it is None, this field will still
+                # be indexed, as `name' is not optional, but it will
+                # not index the None value.
+                DatabaseField("fullname", "XFN", key=["name", "demangled"])
+            ),
             DatabaseField("section", "XSN", key="section"),
             IntegerField("address", "XA", slot=0, key="address"),
             IntegerField("size", "XSZ", slot=1, key="size"),

tests/test_index.py

@@ -518,6 +518,20 @@ def test_searching_by_exact_name(fixture_path, readonly_index):
     assert not_matching_exactly[2].name == "uses_foo"
 
 
+def test_searching_by_exact_name_2(fixture_path, readonly_index):
+    symbols = list(
+        readonly_index.search('fullname:"CppCamelCaseSymbol(char const*)"')
+    )
+    symbols2 = list(
+        readonly_index.search("fullname:_Z18CppCamelCaseSymbolPKc")
+    )
+
+    assert symbols
+    assert symbols == symbols2
+
+    assert symbols[0].name == "_Z18CppCamelCaseSymbolPKc"
+
+
 def test_searching_camel_case(readonly_index):
     symbols = set(readonly_index.search("camel"))
     assert symbols