assorted work

closes #226

Author: sdkrystian

include/mrdox/Corpus.hpp

@@ -16,7 +16,6 @@
 #include <mrdox/Config.hpp>
 #include <mrdox/MetadataFwd.hpp>
 #include <mrdox/Reporter.hpp>
-#include <mrdox/Metadata/Access.hpp>
 #include <mrdox/Metadata/Symbols.hpp>
 #include <clang/Tooling/Execution.h>
 #include <llvm/Support/Mutex.h>
@@ -147,6 +146,13 @@ class MRDOX_VISIBLE
         tooling::ToolExecutor& ex,
         std::shared_ptr<Config const> config,
         Reporter& R);
+
+    // KRYSTIAN NOTE: temporary
+    MRDOX_DECL
+    std::string&
+    getFullyQualifiedName(
+        const Info& I,
+        std::string& temp) const;
 };
 
 //------------------------------------------------

include/mrdox/Metadata/Access.hpp

@@ -16,8 +16,6 @@
 #include <mrdox/Platform.hpp>
 #include <mrdox/ADT/BitField.hpp>
 #include <mrdox/Metadata/Field.hpp>
-#include <mrdox/Metadata/Function.hpp>
-#include <mrdox/Metadata/FunctionKind.hpp>
 #include <mrdox/Metadata/Symbol.hpp>
 #include <mrdox/Metadata/Symbols.hpp>
 #include <mrdox/Metadata/Template.hpp>
@@ -29,6 +27,80 @@
 namespace clang {
 namespace mrdox {
 
+/** An enumeration of the different kinds of functions.
+*/
+enum class FunctionKind
+{
+    // VFALCO The most frequent function kind should be
+    // here, since the bitstream writer does not emit zeroes.
+    Plain = 0,
+
+    // The operator kind values have to match the clang enumeration
+    OpNew /* = clang::OverloadedOperatorKind::OO_New */,
+    OpDelete,
+    OpArray_New,
+    OpArray_Delete,
+    OpPlus,
+    OpMinus,
+    OpStar,
+    OpSlash,
+    OpPercent,
+    OpCaret,
+    OpAmp,
+    OpPipe,
+    OpTilde,
+    OpExclaim,
+    OpEqual,
+    OpLess,
+    OpGreater,
+    OpPlusEqual,
+    OpMinusEqual,
+    OpStarEqual,
+    OpSlashEqual,
+    OpPercentEqual,
+    OpCaretEqual,
+    OpAmpEqual,
+    OpPipeEqual,
+    OpLessLess,
+    OpGreaterGreater,
+    OpLessLessEqual,
+    OpGreaterGreaterEqual,
+    OpEqualEqual,
+    OpExclaimEqual,
+    OpLessEqual,
+    OpGreaterEqual,
+    OpSpaceship,
+    OpAmpAmp,
+    OpPipePipe,
+    OpPlusPlus,
+    OpMinusMinus,
+    OpComma,
+    OpArrowStar,
+    OpArrow,
+    OpCall,
+    OpSubscript,
+    OpConditional,
+    OpCoawait,
+    NUM_OVERLOADED_OPERATORS /* = clang::OverloadedOperatorKind::NUM_OVERLOADED_OPERATORS */,
+
+    Destructor = NUM_OVERLOADED_OPERATORS,
+    Constructor,
+    Conversion
+};
+
+/** Return the function kind corresponding to clang's enum
+*/
+FunctionKind
+getFunctionKind(
+    OverloadedOperatorKind OOK) noexcept;
+
+/** Return a unique string constant for the kind.
+*/
+llvm::StringRef
+getFunctionKindString(
+    FunctionKind kind) noexcept;
+
+
 /** Bit constants used with function specifiers.
 */
 union FnFlags0

include/mrdox/Metadata/Function.hpp

@@ -36,15 +36,15 @@ struct Info
 
     /** Kind of declaration.
     */
-    InfoType const IT = InfoType::IT_default;
+    InfoType IT = InfoType::IT_default;
 
     /** The unqualified name.
     */
     std::string Name;
 
     /** In-order List of parent namespaces.
     */
-    llvm::SmallVector<Reference, 4> Namespace;
+    std::vector<SymbolID> Namespace;
 
     /** The extracted javadoc for this declaration.
     */
@@ -75,13 +75,14 @@ struct Info
     std::string
     extractName() const;
 
+#if 0
     /** Return the fully qualified name.
     */
     MRDOX_DECL
     std::string&
     getFullyQualifiedName(
         std::string& temp) const;
-
+#endif
     /** Return a string representing the symbol type.
 
         For example, "namespace", "class", et. al.

include/mrdox/Metadata/FunctionKind.hpp

@@ -14,7 +14,7 @@
 
 #include <mrdox/Platform.hpp>
 #include <mrdox/MetadataFwd.hpp>
-#include <mrdox/Metadata/Members.hpp>
+#include <mrdox/Metadata/Record.hpp>
 #include <span>
 #include <utility>
 #include <vector>