rename to Scope

Author: vinniefalco

source/lib/AsciidocGenerator.cpp

@@ -468,7 +468,7 @@ listTypedefs(
 void
 listScope(
     Config const& cfg,
-    ScopeChildren const& scope,
+    Scope const& scope,
     llvm::raw_ostream& os)
 {
     listNamespaces(cfg, scope.Namespaces, os);

source/lib/Representation.h

@@ -23,7 +23,7 @@
 #include "jad/Namespace.hpp"
 #include "jad/Record.hpp"
 #include "jad/Reference.hpp"
-#include "jad/ScopeChildren.hpp"
+#include "jad/Scope.hpp"
 #include "jad/Symbol.hpp"
 #include "jad/TemplateParam.hpp"
 #include "jad/Type.hpp"

source/lib/Serialize.cpp

@@ -215,31 +215,31 @@ shouldSerializeInfo(
 // refer to them.
 //
 // See MakeAndInsertIntoParent().
-static void InsertChild(ScopeChildren& Scope, const NamespaceInfo& Info) {
-    Scope.Namespaces.emplace_back(Info.USR, Info.Name, InfoType::IT_namespace,
+static void InsertChild(Scope& scope, const NamespaceInfo& Info) {
+    scope.Namespaces.emplace_back(Info.USR, Info.Name, InfoType::IT_namespace,
         Info.Name, getInfoRelativePath(Info.Namespace));
 }
 
-static void InsertChild(ScopeChildren& Scope, const RecordInfo& Info) {
-    Scope.Records.emplace_back(Info.USR, Info.Name, InfoType::IT_record,
+static void InsertChild(Scope& scope, const RecordInfo& Info) {
+    scope.Records.emplace_back(Info.USR, Info.Name, InfoType::IT_record,
         Info.Name, getInfoRelativePath(Info.Namespace));
 }
 
-static void InsertChild(ScopeChildren& Scope, EnumInfo Info) {
-    Scope.Enums.push_back(std::move(Info));
+static void InsertChild(Scope& scope, EnumInfo Info) {
+    scope.Enums.push_back(std::move(Info));
 }
 
 static
 void
 InsertChild(
-    ScopeChildren& Scope,
+    Scope& scope,
     FunctionInfo Info)
 {
-    Scope.functions.insert(std::move(Info));
+    scope.functions.insert(std::move(Info));
 }
 
-static void InsertChild(ScopeChildren& Scope, TypedefInfo Info) {
-    Scope.Typedefs.push_back(std::move(Info));
+static void InsertChild(Scope& scope, TypedefInfo Info) {
+    scope.Typedefs.push_back(std::move(Info));
 }
 
 // Creates a parent of the correct type for the given child and inserts it into

source/lib/jad/AccessScope.hpp

@@ -17,7 +17,7 @@
 #ifndef MRDOX_JAD_ACCESSSCOPE_HPP
 #define MRDOX_JAD_ACCESSSCOPE_HPP
 
-#include "jad/ScopeChildren.hpp"
+#include "jad/Scope.hpp"
 #include <clang/Basic/Specifiers.h>
 
 namespace clang {
@@ -27,11 +27,11 @@ namespace mrdox {
 */
 struct AccessScope
 {
-    ScopeChildren& pub;
-    ScopeChildren& prot;
-    ScopeChildren& priv;
+    Scope& pub;
+    Scope& prot;
+    Scope& priv;
 
-    ScopeChildren&
+    Scope&
     get(clang::AccessSpecifier access)
     {
         assert(access != clang::AccessSpecifier::AS_none);
@@ -50,7 +50,7 @@ struct AccessScope
     }
 
 private:
-    ScopeChildren v_[3];
+    Scope v_[3];
 };
 
 } // mrdox

source/lib/jad/Namespace.hpp

@@ -13,7 +13,7 @@
 #define MRDOX_JAD_NAMESPACE_HPP
 
 #include "jad/Info.hpp"
-#include "jad/ScopeChildren.hpp"
+#include "jad/Scope.hpp"
 
 namespace clang {
 namespace mrdox {
@@ -23,7 +23,7 @@ namespace mrdox {
 struct NamespaceInfo
     : public Info
 {
-    ScopeChildren Children;
+    Scope Children;
 
     NamespaceInfo(
         SymbolID USR = SymbolID(),

source/lib/jad/Record.cpp

@@ -23,7 +23,6 @@ RecordInfo(
     StringRef Name,
     StringRef Path)
     : SymbolInfo(InfoType::IT_record, USR, Name, Path)
-    , scope()
 {
 }
 

source/lib/jad/Record.hpp

@@ -15,7 +15,7 @@
 #include "jad/AccessScope.hpp"
 #include "jad/MemberType.hpp"
 #include "jad/Reference.hpp"
-#include "jad/ScopeChildren.hpp"
+#include "jad/Scope.hpp"
 #include "jad/Symbol.hpp"
 #include "jad/Template.hpp"
 #include "jad/Types.hpp"
@@ -64,8 +64,8 @@ struct RecordInfo : public SymbolInfo
 
     std::vector<BaseRecordInfo> Bases;              // List of base/parent records; this includes inherited methods and attributes
 
-    ScopeChildren Children;
-    AccessScope scope;
+    Scope Children;
+    //AccessScope scope;
 };
 
 //------------------------------------------------

source/lib/jad/ScopeChildren.hpp renamed to source/lib/jad/Scope.hpp

@@ -9,13 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-//
-// This file defines the internal representations of different declaration
-// types for the clang-doc tool.
-//
-
-#ifndef MRDOX_JAD_SCOPECHILDREN_HPP
-#define MRDOX_JAD_SCOPECHILDREN_HPP
+#ifndef MRDOX_JAD_SCOPE_HPP
+#define MRDOX_JAD_SCOPE_HPP
 
 #include "jad/Enum.hpp"
 #include "jad/Function.hpp"
@@ -31,7 +26,7 @@ struct TypedefInfo;
 
 /** A container for the declaration in a namespace.
 */
-struct ScopeChildren
+struct Scope
 {
     // VFALCO REMOVE
     clang::AccessSpecifier access;
@@ -49,7 +44,7 @@ struct ScopeChildren
     std::vector<EnumInfo> Enums;
     std::vector<TypedefInfo> Typedefs;
 
-    ScopeChildren(
+    Scope(
         clang::AccessSpecifier access_ =
             clang::AccessSpecifier::AS_public) noexcept
         : access(access_)

source/lib/jad/TemplateParams.hpp

@@ -23,7 +23,7 @@
 #include "jad/Location.hpp"
 #include "jad/Namespace.hpp"
 #include "jad/Reference.hpp"
-#include "jad/ScopeChildren.hpp"
+#include "jad/Scope.hpp"
 #include "jad/Symbol.hpp"
 #include "jad/Types.hpp"
 #include <clang/AST/Type.h>