From 2e4b285480134658f18ea2b5602b2fcd7795b842 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 18 Jun 2023 20:50:33 -0700 Subject: [PATCH] chore: dom::create spelling --- include/mrdox/Dom/DomArray.hpp | 2 +- include/mrdox/Support/Dom.hpp | 6 +++--- source/-adoc/Builder.cpp | 8 ++++---- source/Dom/DomBaseArray.cpp | 2 +- source/Dom/DomParam.cpp | 2 +- source/Dom/DomParamArray.cpp | 2 +- source/Dom/DomSource.cpp | 4 ++-- source/Dom/DomSymbol.cpp | 22 +++++++++++----------- source/Dom/DomSymbolArray.cpp | 2 +- source/Dom/DomType.cpp | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/mrdox/Dom/DomArray.hpp b/include/mrdox/Dom/DomArray.hpp index ddeb0654e..ac4b94252 100644 --- a/include/mrdox/Dom/DomArray.hpp +++ b/include/mrdox/Dom/DomArray.hpp @@ -45,7 +45,7 @@ class MRDOX_DECL { if(index >= list_.size()) return nullptr; - return dom::makePointer(list_[index], corpus_); + return dom::create(list_[index], corpus_); } }; diff --git a/include/mrdox/Support/Dom.hpp b/include/mrdox/Support/Dom.hpp index b42ca6eef..88acc92ef 100644 --- a/include/mrdox/Support/Dom.hpp +++ b/include/mrdox/Support/Dom.hpp @@ -74,7 +74,7 @@ class MRDOX_DECL }; template -auto makePointer(Args&&... args); +auto create(Args&&... args); /** A pointer container for object or array. */ @@ -136,11 +136,11 @@ class Pointer } template - friend auto makePointer(Args&&... args); + friend auto create(Args&&... args); }; template -auto makePointer(Args&&... args) +auto create(Args&&... args) { return Pointer(new U( std::forward(args)...)); diff --git a/source/-adoc/Builder.cpp b/source/-adoc/Builder.cpp index 03b9de338..8257075d9 100644 --- a/source/-adoc/Builder.cpp +++ b/source/-adoc/Builder.cpp @@ -164,7 +164,7 @@ Expected Builder:: renderSinglePageHeader() { - auto obj = dom::makePointer(); + auto obj = dom::create(); auto text = callTemplate("single-header.adoc.hbs", obj); return text; } @@ -173,7 +173,7 @@ Expected Builder:: renderSinglePageFooter() { - auto obj = dom::makePointer(); + auto obj = dom::create(); auto text = callTemplate("single-footer.adoc.hbs", obj); return text; } @@ -189,7 +189,7 @@ getSymbol( [&](T const& I) -> dom::ObjectPtr { - return dom::makePointer< + return dom::create< DomSymbol>(I, corpus_); }); } @@ -199,7 +199,7 @@ Builder:: createContext( SymbolID const& id) { - return dom::makePointer( + return dom::create( DomContext::Hash({ { "document", "test" }, { "symbol", getSymbol(id) } diff --git a/source/Dom/DomBaseArray.cpp b/source/Dom/DomBaseArray.cpp index dec76f9ac..eb9070bf0 100644 --- a/source/Dom/DomBaseArray.cpp +++ b/source/Dom/DomBaseArray.cpp @@ -36,7 +36,7 @@ get( std::size_t index) const { if(index < list_.size()) - return dom::makePointer( + return dom::create( corpus_.get( list_[index].Type.id), list_[index], diff --git a/source/Dom/DomParam.cpp b/source/Dom/DomParam.cpp index 93ff17f75..714e054b4 100644 --- a/source/Dom/DomParam.cpp +++ b/source/Dom/DomParam.cpp @@ -30,7 +30,7 @@ get(std::string_view key) const if(key == "name") return dom::nonEmptyString(I_->Name); if(key == "type") - return dom::makePointer(I_->Type, corpus_); + return dom::create(I_->Type, corpus_); if(key == "default") return dom::nonEmptyString(I_->Default); return nullptr; diff --git a/source/Dom/DomParamArray.cpp b/source/Dom/DomParamArray.cpp index 1e19927f2..b339fd039 100644 --- a/source/Dom/DomParamArray.cpp +++ b/source/Dom/DomParamArray.cpp @@ -36,7 +36,7 @@ get(std::size_t index) const { if(index >= list_.size()) return nullptr; - return dom::makePointer( + return dom::create( list_[index], corpus_); } diff --git a/source/Dom/DomSource.cpp b/source/Dom/DomSource.cpp index ee396f076..48eacf27a 100644 --- a/source/Dom/DomSource.cpp +++ b/source/Dom/DomSource.cpp @@ -32,11 +32,11 @@ get(std::string_view key) const { if(! I_.DefLoc) return nullptr; - return dom::makePointer( + return dom::create( *I_.DefLoc, corpus_); } if(key == "decl") - return dom::makePointer>(I_.Loc, corpus_); return nullptr; } diff --git a/source/Dom/DomSymbol.cpp b/source/Dom/DomSymbol.cpp index 2cf876c6d..c92423e4f 100644 --- a/source/Dom/DomSymbol.cpp +++ b/source/Dom/DomSymbol.cpp @@ -49,24 +49,24 @@ get(std::string_view key) const if(key == "name") return I_->Name; if(key == "namespace") - return dom::makePointer( + return dom::create( I_->Namespace, corpus_); if(key == "doc") { if(I_->javadoc) - return dom::makePointer( + return dom::create( *I_->javadoc, corpus_); return nullptr; } if constexpr(std::derived_from) { if(key == "loc") - return dom::makePointer(*I_, corpus_); + return dom::create(*I_, corpus_); } if constexpr(T::isNamespace()) { if(key == "members") - return dom::makePointer( + return dom::create( I_->Members, corpus_); if(key == "specializations") return nullptr; @@ -78,16 +78,16 @@ get(std::string_view key) const if(key == "is-typedef") return I_->IsTypeDef; if(key == "bases") - return dom::makePointer( + return dom::create( I_->Bases, corpus_); if(key == "friends") - return dom::makePointer( + return dom::create( I_->Friends, corpus_); if(key == "members") - return dom::makePointer( + return dom::create( I_->Members, corpus_); if(key == "specializations") - return dom::makePointer( + return dom::create( I_->Specializations, corpus_); if(key == "template") { @@ -99,13 +99,13 @@ get(std::string_view key) const if constexpr(T::isFunction()) { if(key == "params") - return dom::makePointer( + return dom::create( I_->Params, corpus_); if(key == "return") - return dom::makePointer( + return dom::create( I_->ReturnType, corpus_); if(key == "specs") - return dom::makePointer( + return dom::create( *I_, corpus_); if(key == "template") { diff --git a/source/Dom/DomSymbolArray.cpp b/source/Dom/DomSymbolArray.cpp index 98e78b4dc..0cbd4b075 100644 --- a/source/Dom/DomSymbolArray.cpp +++ b/source/Dom/DomSymbolArray.cpp @@ -41,7 +41,7 @@ get(std::size_t index) const [&](T const& I) -> dom::ObjectPtr { - return dom::makePointer< + return dom::create< DomSymbol>(I, corpus_); }); } diff --git a/source/Dom/DomType.cpp b/source/Dom/DomType.cpp index 6be4eead1..5c0ca491e 100644 --- a/source/Dom/DomType.cpp +++ b/source/Dom/DomType.cpp @@ -49,7 +49,7 @@ get(std::string_view key) const [&](T const& I) -> dom::ObjectPtr { - return dom::makePointer< + return dom::create< DomSymbol>(I, corpus_); }); }