Another crack at filtering out type-parameter-N-M

adobe · Oct 26, 2018 · 53b1601 · 53b1601
1 parent 94ac989
commit 53b1601
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 153 deletions.
diff --git a/matchers/class_matcher.cpp b/matchers/class_matcher.cpp
@@ -73,7 +73,7 @@ class FindStaticMembers : public RecursiveASTVisitor<FindStaticMembers> {
             auto type = hyde::StandardDeclInfo(context, d);
             auto name = type["qualified_name"].get<std::string>();
             type["static"] = true;
-            type["type"] = hyde::to_string(context, d->getType());
+            type["type"] = hyde::to_string(d, d->getType());
             static_members[name] = type;
         }
         return true;
@@ -151,7 +151,7 @@ void ClassInfo::run(const MatchFinder::MatchResult& Result) {
         if (!AccessCheck(_access_filter, field->getAccess())) continue;
 
         json fieldInfo = StandardDeclInfo(Result.Context, field);
-        fieldInfo["type"] = hyde::to_string(Result.Context, field->getType());
+        fieldInfo["type"] = hyde::to_string(field, field->getType());
         info["fields"][static_cast<const std::string&>(fieldInfo["qualified_name"])] =
             fieldInfo; // can't move this into place for some reason.
     }
@@ -174,7 +174,7 @@ void ClassInfo::run(const MatchFinder::MatchResult& Result) {
         if (!AccessCheck(_access_filter, type_def->getAccess())) continue;
 
         json typedefInfo = StandardDeclInfo(Result.Context, type_def);
-        typedefInfo["type"] = hyde::to_string(Result.Context, type_def->getUnderlyingType());
+        typedefInfo["type"] = hyde::to_string(type_def, type_def->getUnderlyingType());
 
         info["typedefs"].push_back(std::move(typedefInfo));
     }
@@ -188,7 +188,7 @@ void ClassInfo::run(const MatchFinder::MatchResult& Result) {
         if (!AccessCheck(_access_filter, type_alias->getAccess())) continue;
 
         json typealiasInfo = StandardDeclInfo(Result.Context, type_alias);
-        typealiasInfo["type"] = hyde::to_string(Result.Context, type_alias->getUnderlyingType());
+        typealiasInfo["type"] = hyde::to_string(type_alias, type_alias->getUnderlyingType());
         if (auto template_decl = type_alias->getDescribedAliasTemplate()) {
             typealiasInfo["template_parameters"] =
                 GetTemplateParameters(Result.Context, template_decl);

diff --git a/matchers/enum_matcher.cpp b/matchers/enum_matcher.cpp
@@ -43,7 +43,7 @@ void EnumInfo::run(const MatchFinder::MatchResult& Result) {
     json info = StandardDeclInfo(Result.Context, enumeration);
     //info["scoped"] = enumeration->isScoped();
     //info["fixed"] = enumeration->isFixed();
-    info["type"] = hyde::to_string(Result.Context, enumeration->getIntegerType());
+    info["type"] = hyde::to_string(enumeration, enumeration->getIntegerType());
     info["values"] = json::array();
 
     for (const auto& p : enumeration->enumerators()) {

diff --git a/matchers/matcher_fwd.hpp b/matchers/matcher_fwd.hpp
@@ -18,9 +18,9 @@ namespace hyde {
 /**************************************************************************************************/
 
 enum ToolAccessFilter {
-    ToolAccessFilterPublic,
+    ToolAccessFilterPrivate,
     ToolAccessFilterProtected,
-    ToolAccessFilterPrivate
+    ToolAccessFilterPublic,
 };
 
 /**************************************************************************************************/

diff --git a/matchers/typealias_matcher.cpp b/matchers/typealias_matcher.cpp
@@ -45,7 +45,7 @@ void TypeAliasInfo::run(const MatchFinder::MatchResult& Result) {
     // do not process class type aliases here.
     if (!info["parents"].empty()) return;
 
-    info["type"] = hyde::to_string(Result.Context, node->getUnderlyingType());
+    info["type"] = hyde::to_string(node, node->getUnderlyingType());
 
     if (auto template_decl = node->getDescribedAliasTemplate()) {
         info["template_parameters"] = GetTemplateParameters(Result.Context, template_decl);

diff --git a/matchers/typedef_matcher.cpp b/matchers/typedef_matcher.cpp
@@ -45,7 +45,7 @@ void TypedefInfo::run(const MatchFinder::MatchResult& Result) {
     // do not process class type aliases here.
     if (!info["parents"].empty()) return;
 
-    info["type"] = hyde::to_string(Result.Context, node->getUnderlyingType());
+    info["type"] = hyde::to_string(node, node->getUnderlyingType());
 
     _j["typedefs"].push_back(std::move(info));
 }