Skip to content

Commit c3562c2

Browse files
vinniefalcovinniefalco
committed
refactor frontend and commandline
1 parent 3dea5c4 commit c3562c2

27 files changed

+250
-167
lines changed

‎include/mrdox/mrdox.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
#include "llvm/Support/Error.h"
1818

1919
namespace clang {
20-
namespace doc {
20+
namespace mrdox {
2121

2222
llvm::Expected<llvm::Twine>
2323
renderXML(
2424
llvm::StringRef fileName);
2525

26-
} // doc
26+
} // mrdox
2727
} // clang
2828

2929
#endif

‎source/lib/AsciidocGenerator.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using namespace llvm;
2222

2323
namespace clang {
24-
namespace doc {
24+
namespace mrdox {
2525

2626
namespace {
2727

@@ -743,7 +743,7 @@ class AsciidocGenerator : public Generator
743743
llvm::Error
744744
generateDocs(
745745
StringRef RootDir,
746-
llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
746+
llvm::StringMap<std::unique_ptr<mrdox::Info>> Infos,
747747
ClangDocContext const& CDCtx) override;
748748

749749
llvm::Error
@@ -764,16 +764,16 @@ llvm::Error
764764
AsciidocGenerator::
765765
generateDocs(
766766
StringRef RootDir,
767-
llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
767+
llvm::StringMap<std::unique_ptr<mrdox::Info>> Infos,
768768
ClangDocContext const& CDCtx)
769769
{
770770
// Track which directories we already tried to create.
771771
llvm::StringSet<> CreatedDirs;
772772

773773
// Collect all output by file name and create the necessary directories.
774-
llvm::StringMap<std::vector<doc::Info*>> FileToInfos;
774+
llvm::StringMap<std::vector<mrdox::Info*>> FileToInfos;
775775
for (const auto& Group : Infos) {
776-
doc::Info* Info = Group.getValue().get();
776+
mrdox::Info* Info = Group.getValue().get();
777777

778778
llvm::SmallString<128> Path;
779779
llvm::sys::path::native(RootDir, Path);
@@ -820,19 +820,19 @@ generateDocForInfo(
820820
switch (I->IT)
821821
{
822822
case InfoType::IT_namespace:
823-
makeNamespacePage(CDCtx, *static_cast<clang::doc::NamespaceInfo*>(I), os);
823+
makeNamespacePage(CDCtx, *static_cast<clang::mrdox::NamespaceInfo*>(I), os);
824824
break;
825825
case InfoType::IT_record:
826-
genMarkdown(CDCtx, *static_cast<clang::doc::RecordInfo*>(I), os);
826+
genMarkdown(CDCtx, *static_cast<clang::mrdox::RecordInfo*>(I), os);
827827
break;
828828
case InfoType::IT_enum:
829-
genMarkdown(CDCtx, *static_cast<clang::doc::EnumInfo*>(I), os);
829+
genMarkdown(CDCtx, *static_cast<clang::mrdox::EnumInfo*>(I), os);
830830
break;
831831
case InfoType::IT_function:
832-
genMarkdown(CDCtx, *static_cast<clang::doc::FunctionInfo*>(I), os);
832+
genMarkdown(CDCtx, *static_cast<clang::mrdox::FunctionInfo*>(I), os);
833833
break;
834834
case InfoType::IT_typedef:
835-
genMarkdown(CDCtx, *static_cast<clang::doc::TypedefInfo*>(I), os);
835+
genMarkdown(CDCtx, *static_cast<clang::mrdox::TypedefInfo*>(I), os);
836836
break;
837837
case InfoType::IT_default:
838838
return createStringError(llvm::inconvertibleErrorCode(),
@@ -871,5 +871,5 @@ Add<AsciidocGenerator> Asciidoc(
871871
// file and thus register the generator.
872872
volatile int AsciidocGeneratorAnchorSource = 0;
873873

874-
} // namespace doc
874+
} // namespace mrdox
875875
} // namespace clang

‎source/lib/BitcodeReader.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <optional>
1717

1818
namespace clang {
19-
namespace doc {
19+
namespace mrdox {
2020

2121
using Record = llvm::SmallVector<uint64_t, 1024>;
2222

@@ -1142,5 +1142,5 @@ ClangDocBitcodeReader::readBitcode() {
11421142
return std::move(Infos);
11431143
}
11441144

1145-
} // namespace doc
1145+
} // namespace mrdox
11461146
} // namespace clang

‎source/lib/BitcodeReader.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <optional>
2828

2929
namespace clang {
30-
namespace doc {
30+
namespace mrdox {
3131

3232
// Class to read bitstream into an InfoSet collection
3333
class ClangDocBitcodeReader {
@@ -72,7 +72,7 @@ class ClangDocBitcodeReader {
7272
FieldId CurrentReferenceField;
7373
};
7474

75-
} // namespace doc
75+
} // namespace mrdox
7676
} // namespace clang
7777

7878
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_BITCODEREADER_H

‎source/lib/BitcodeWriter.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <initializer_list>
1515

1616
namespace clang {
17-
namespace doc {
17+
namespace mrdox {
1818

1919
// Empty SymbolID for comparison, so we don't have to construct one every time.
2020
static const SymbolID EmptySID = SymbolID();
@@ -662,19 +662,19 @@ void ClangDocBitcodeWriter::emitBlock(const TemplateParamInfo& T) {
662662
bool ClangDocBitcodeWriter::dispatchInfoForWrite(Info* I) {
663663
switch (I->IT) {
664664
case InfoType::IT_namespace:
665-
emitBlock(*static_cast<clang::doc::NamespaceInfo*>(I));
665+
emitBlock(*static_cast<clang::mrdox::NamespaceInfo*>(I));
666666
break;
667667
case InfoType::IT_record:
668-
emitBlock(*static_cast<clang::doc::RecordInfo*>(I));
668+
emitBlock(*static_cast<clang::mrdox::RecordInfo*>(I));
669669
break;
670670
case InfoType::IT_enum:
671-
emitBlock(*static_cast<clang::doc::EnumInfo*>(I));
671+
emitBlock(*static_cast<clang::mrdox::EnumInfo*>(I));
672672
break;
673673
case InfoType::IT_function:
674-
emitBlock(*static_cast<clang::doc::FunctionInfo*>(I));
674+
emitBlock(*static_cast<clang::mrdox::FunctionInfo*>(I));
675675
break;
676676
case InfoType::IT_typedef:
677-
emitBlock(*static_cast<clang::doc::TypedefInfo*>(I));
677+
emitBlock(*static_cast<clang::mrdox::TypedefInfo*>(I));
678678
break;
679679
default:
680680
llvm::errs() << "Unexpected info, unable to write.\n";
@@ -683,5 +683,5 @@ bool ClangDocBitcodeWriter::dispatchInfoForWrite(Info* I) {
683683
return false;
684684
}
685685

686-
} // namespace doc
686+
} // namespace mrdox
687687
} // namespace clang

‎source/lib/BitcodeWriter.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <vector>
2929

3030
namespace clang {
31-
namespace doc {
31+
namespace mrdox {
3232

3333
// Current version number of clang-doc bitcode.
3434
// Should be bumped when removing or changing BlockIds, RecordIds, or
@@ -243,7 +243,7 @@ class ClangDocBitcodeWriter {
243243
AbbreviationMap Abbrevs;
244244
};
245245

246-
} // namespace doc
246+
} // namespace mrdox
247247
} // namespace clang
248248

249249
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_BITCODEWRITER_H

‎source/lib/ClangDoc.cpp

+10-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "clang/Frontend/FrontendAction.h"
2222

2323
namespace clang {
24-
namespace doc {
24+
namespace mrdox {
2525

2626
namespace {
2727

@@ -79,6 +79,14 @@ struct factory
7979

8080
//------------------------------------------------
8181

82+
std::unique_ptr<
83+
clang::FrontendAction>
84+
makeFrontendAction(
85+
ClangDocContext CDCtx)
86+
{
87+
return std::make_unique<action>(CDCtx);
88+
}
89+
8290
std::unique_ptr<
8391
tooling::FrontendActionFactory>
8492
newMapperActionFactory(
@@ -87,5 +95,5 @@ newMapperActionFactory(
8795
return std::make_unique<factory>(CDCtx);
8896
}
8997

90-
} // namespace doc
98+
} // namespace mrdox
9199
} // namespace clang

‎source/lib/ClangDoc.h

+9-4
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,27 @@
1616
// ExecutionContext.
1717
//
1818

19-
#ifndef MRFOX_FRONTEND_TOOL
20-
#define MRFOX_FRONTEND_TOOL
19+
#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_CLANGDOC_H
20+
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_CLANGDOC_H
2121

2222
#include "Representation.h"
2323

2424
#include "clang/Tooling/Tooling.h"
2525

2626
namespace clang {
27-
namespace doc {
27+
namespace mrdox {
28+
29+
std::unique_ptr<
30+
clang::FrontendAction>
31+
makeFrontendAction(
32+
ClangDocContext CDCtx);
2833

2934
std::unique_ptr<
3035
tooling::FrontendActionFactory>
3136
newMapperActionFactory(
3237
ClangDocContext CDCtx);
3338

34-
} // namespace doc
39+
} // namespace mrdox
3540
} // namespace clang
3641

3742
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_CLANGDOC_H

‎source/lib/CommentVisitor.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//#include <clang/AST/CommentCommandInfo.inc>
2121

2222
namespace clang {
23-
namespace doc {
23+
namespace mrdox {
2424
namespace serialize {
2525

2626
using namespace clang::comments;
@@ -397,7 +397,7 @@ parseComment(
397397
Javadoc& javadoc,
398398
CommentInfo& ci)
399399
{
400-
clang::doc::serialize::CommentVisitor v(*c, ctx, javadoc);
400+
clang::mrdox::serialize::CommentVisitor v(*c, ctx, javadoc);
401401
v.parse(c, ci);
402402

403403
// debugging
@@ -409,5 +409,5 @@ parseComment(
409409
*/
410410
}
411411

412-
} // namespace doc
412+
} // namespace mrdox
413413
} // namespace clang

‎source/lib/CommentVisitor.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <clang/AST/ASTContext.h>
1717

1818
namespace clang {
19-
namespace doc {
19+
namespace mrdox {
2020

2121
/** Parse a FullComment
2222
*/
@@ -27,7 +27,7 @@ parseComment(
2727
Javadoc& javadoc,
2828
CommentInfo& ci);
2929

30-
} // doc
30+
} // mrdox
3131
} // clang
3232

3333
#endif

‎source/lib/Functions.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "Representation.h"
1515

1616
namespace clang {
17-
namespace doc {
17+
namespace mrdox {
1818

1919
// we assume that there are 4 access controls
2020
static_assert(
@@ -106,6 +106,6 @@ find(
106106
return it;
107107
}
108108

109-
} // doc
109+
} // mrdox
110110
} // clang
111111

‎source/lib/Functions.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <vector>
1818

1919
namespace clang {
20-
namespace doc {
20+
namespace mrdox {
2121

2222
//------------------------------------------------
2323

@@ -105,7 +105,7 @@ struct FunctionList
105105

106106
//------------------------------------------------
107107

108-
} // doc
108+
} // mrdox
109109
} // clang
110110

111111
#endif

‎source/lib/Generators.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
#include "Generators.h"
1313

14-
LLVM_INSTANTIATE_REGISTRY(clang::doc::GeneratorRegistry)
14+
LLVM_INSTANTIATE_REGISTRY(clang::mrdox::GeneratorRegistry)
1515

1616
namespace clang {
17-
namespace doc {
17+
namespace mrdox {
1818

1919
llvm::Expected<std::unique_ptr<Generator>>
2020
findGeneratorByName(llvm::StringRef Format) {
@@ -59,7 +59,7 @@ llvm::Error Generator::createResources(ClangDocContext &CDCtx) {
5959
// |--X
6060
// If the references to the namespaces do not exist, they will be created. If
6161
// the references already exist, the same one will be used.
62-
void Generator::addInfoToIndex(Index &Idx, const doc::Info *Info) {
62+
void Generator::addInfoToIndex(Index &Idx, const mrdox::Info *Info) {
6363
// Index pointer that will be moving through Idx until the first parent
6464
// namespace of Info (where the reference has to be inserted) is found.
6565
Index *I = &Idx;
@@ -112,5 +112,5 @@ extern volatile int XMLGeneratorAnchorSource;
112112
static int LLVM_ATTRIBUTE_UNUSED XMLGeneratorAnchorDest =
113113
AsciidocGeneratorAnchorSource;
114114

115-
} // namespace doc
115+
} // namespace mrdox
116116
} // namespace clang

‎source/lib/Generators.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "llvm/Support/Registry.h"
2121

2222
namespace clang {
23-
namespace doc {
23+
namespace mrdox {
2424

2525
// Abstract base class for generators.
2626
// This is expected to be implemented and exposed via the GeneratorRegistry.
@@ -32,7 +32,7 @@ class Generator {
3232
// format.
3333
virtual llvm::Error
3434
generateDocs(StringRef RootDir,
35-
llvm::StringMap<std::unique_ptr<doc::Info>> Infos,
35+
llvm::StringMap<std::unique_ptr<mrdox::Info>> Infos,
3636
const ClangDocContext &CDCtx) = 0;
3737

3838
// This function writes a file with the index previously constructed.
@@ -45,7 +45,7 @@ class Generator {
4545
virtual llvm::Error generateDocForInfo(Info *I, llvm::raw_ostream &OS,
4646
const ClangDocContext &CDCtx) = 0;
4747

48-
static void addInfoToIndex(Index &Idx, const doc::Info *Info);
48+
static void addInfoToIndex(Index &Idx, const mrdox::Info *Info);
4949
};
5050

5151
typedef llvm::Registry<Generator> GeneratorRegistry;
@@ -55,7 +55,7 @@ findGeneratorByName(llvm::StringRef Format);
5555

5656
std::string getTagType(TagTypeKind AS);
5757

58-
} // namespace doc
58+
} // namespace mrdox
5959
} // namespace clang
6060

6161
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_GENERATOR_H

0 commit comments

Comments
 (0)