Skip to content

Commit 153a10b

Browse files
fpelliccionifpelliccioni
committed
feat: tagfiles generation for cross-referencing in doxygen format
1 parent 055d3f9 commit 153a10b

18 files changed

+720
-21
lines changed

‎include/mrdocs/Generator.hpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,16 @@ class MRDOCS_VISIBLE
116116
@param os The stream to write to.
117117
118118
@param corpus The metadata to emit.
119+
120+
@param fileName The file name to use for the output.
119121
*/
120122
MRDOCS_DECL
121123
virtual
122124
Error
123125
buildOne(
124126
std::ostream& os,
125-
Corpus const& corpus) const = 0;
127+
Corpus const& corpus,
128+
std::string_view fileName) const = 0;
126129

127130
/** Build the reference as a single page to a file.
128131

‎src/lib/Gen/adoc/AdocGenerator.cpp‎

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
#include "MultiPageVisitor.hpp"
1616
#include "SinglePageVisitor.hpp"
1717
#include "lib/Support/LegibleNames.hpp"
18+
#include "lib/Support/RawOstream.hpp"
19+
#include <llvm/Support/FileSystem.h>
20+
#include <llvm/Support/Path.h>
1821
#include <mrdocs/Metadata/DomMetadata.hpp>
1922
#include <mrdocs/Support/Error.hpp>
2023
#include <mrdocs/Support/Path.hpp>
24+
#include <fstream>
2125
#include <optional>
2226
#include <vector>
2327

@@ -70,10 +74,35 @@ build(
7074
if(! ex)
7175
return ex.error();
7276

73-
MultiPageVisitor visitor(*ex, outputPath, corpus);
77+
std::string path = files::appendPath(outputPath, "reference.tag.xml");
78+
if(auto err = files::createDirectory(outputPath))
79+
{
80+
return err;
81+
}
82+
83+
std::ofstream os;
84+
try
85+
{
86+
os.open(path,
87+
std::ios_base::binary |
88+
std::ios_base::out |
89+
std::ios_base::trunc // | std::ios_base::noreplace
90+
);
91+
}
92+
catch(std::exception const& ex)
93+
{
94+
return formatError("std::ofstream(\"{}\") threw \"{}\"", path, ex.what());
95+
}
96+
97+
RawOstream raw_os(os);
98+
auto tagfileWriter = TagfileWriter(raw_os, corpus);
99+
tagfileWriter.initialize();
100+
101+
MultiPageVisitor visitor(*ex, outputPath, corpus, tagfileWriter);
74102
visitor(corpus.globalNamespace());
75103

76104
auto errors = ex->wait();
105+
tagfileWriter.finalize();
77106
if(! errors.empty())
78107
return Error(errors);
79108
return Error::success();
@@ -83,8 +112,12 @@ Error
83112
AdocGenerator::
84113
buildOne(
85114
std::ostream& os,
86-
Corpus const& corpus) const
115+
Corpus const& corpus,
116+
std::string_view outputPath) const
87117
{
118+
namespace path = llvm::sys::path;
119+
using SmallString = llvm::SmallString<0>;
120+
88121
auto options = loadOptions(corpus);
89122
if(! options)
90123
return options.error();
@@ -106,9 +139,36 @@ buildOne(
106139
if(! errors.empty())
107140
return {errors};
108141

109-
SinglePageVisitor visitor(*ex, corpus, os);
142+
SmallString fileName(outputPath);
143+
path::replace_extension(fileName, "tag.xml");
144+
auto parentDir = files::getParentDir(fileName.str());
145+
if(auto err = files::createDirectory(parentDir))
146+
{
147+
return err;
148+
}
149+
150+
std::ofstream osTagfile;
151+
try
152+
{
153+
osTagfile.open(fileName.str().str(),
154+
std::ios_base::binary |
155+
std::ios_base::out |
156+
std::ios_base::trunc // | std::ios_base::noreplace
157+
);
158+
}
159+
catch(std::exception const& ex)
160+
{
161+
return formatError("std::ofstream(\"{}\") threw \"{}\"", fileName.str().str(), ex.what());
162+
}
163+
164+
RawOstream raw_os(osTagfile);
165+
auto tagfileWriter = TagfileWriter(raw_os, corpus);
166+
tagfileWriter.initialize();
167+
168+
SinglePageVisitor visitor(*ex, corpus, os, outputPath, tagfileWriter);
110169
visitor(corpus.globalNamespace());
111170
errors = ex->wait();
171+
tagfileWriter.finalize();
112172
if(! errors.empty())
113173
return {errors};
114174

‎src/lib/Gen/adoc/AdocGenerator.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ class AdocGenerator
4949
Error
5050
buildOne(
5151
std::ostream& os,
52-
Corpus const& corpus) const override;
52+
Corpus const& corpus,
53+
std::string_view fileName) const override;
5354
};
5455

5556
} // adoc

‎src/lib/Gen/adoc/MultiPageVisitor.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,12 @@ operator()(T const& I)
5050
{
5151
ex_.async([this, &I](Builder& builder)
5252
{
53-
if(const auto r = builder(I))
54-
writePage(*r, builder.domCorpus.getXref(I));
53+
if(const auto r = builder(I))
54+
{
55+
auto const xref = builder.domCorpus.getXref(I);
56+
writePage(*r, xref);
57+
tagfileWriter_(I, xref);
58+
}
5559
else
5660
r.error().Throw();
5761
if constexpr(

‎src/lib/Gen/adoc/MultiPageVisitor.hpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#define MRDOCS_LIB_GEN_ADOC_MULTIPAGEVISITOR_HPP
1313

1414
#include "Builder.hpp"
15+
#include <lib/Lib/TagfileWriter.hpp>
1516
#include <mrdocs/Support/ExecutorGroup.hpp>
1617
#include <mutex>
1718
#include <ostream>
@@ -29,6 +30,7 @@ class MultiPageVisitor
2930
ExecutorGroup<Builder>& ex_;
3031
std::string_view outputPath_;
3132
Corpus const& corpus_;
33+
TagfileWriter& tagfileWriter_;
3234

3335
void
3436
writePage(
@@ -39,10 +41,12 @@ class MultiPageVisitor
3941
MultiPageVisitor(
4042
ExecutorGroup<Builder>& ex,
4143
std::string_view outputPath,
42-
Corpus const& corpus) noexcept
44+
Corpus const& corpus,
45+
TagfileWriter& tagfileWriter) noexcept
4346
: ex_(ex)
4447
, outputPath_(outputPath)
4548
, corpus_(corpus)
49+
, tagfileWriter_(tagfileWriter)
4650
{
4751
}
4852

‎src/lib/Gen/adoc/SinglePageVisitor.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ operator()(T const& I)
2222
{
2323
ex_.async([this, &I, page = numPages_++](Builder& builder)
2424
{
25-
if(auto r = builder(I))
25+
if(auto r = builder(I))
26+
{
2627
writePage(*r, page);
28+
tagfileWriter_(I, fileName_);
29+
}
2730
else
2831
r.error().Throw();
2932
});

‎src/lib/Gen/adoc/SinglePageVisitor.hpp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include "Builder.hpp"
1515
#include <mrdocs/MetadataFwd.hpp>
16+
#include <lib/Lib/TagfileWriter.hpp>
1617
#include <mrdocs/Support/ExecutorGroup.hpp>
1718
#include <mutex>
1819
#include <ostream>
@@ -35,16 +36,22 @@ class SinglePageVisitor
3536
std::size_t topPage_ = 0;
3637
std::vector<std::optional<
3738
std::string>> pages_;
39+
std::string fileName_;
40+
TagfileWriter& tagfileWriter_;
3841

3942
void writePage(std::string pageText, std::size_t pageNumber);
4043
public:
4144
SinglePageVisitor(
4245
ExecutorGroup<Builder>& ex,
4346
Corpus const& corpus,
44-
std::ostream& os) noexcept
47+
std::ostream& os,
48+
std::string_view fileName,
49+
TagfileWriter& tagfileWriter) noexcept
4550
: ex_(ex)
4651
, corpus_(corpus)
4752
, os_(os)
53+
, fileName_(fileName)
54+
, tagfileWriter_(tagfileWriter)
4855
{
4956
}
5057

‎src/lib/Gen/html/HTMLGenerator.cpp‎

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
#include "MultiPageVisitor.hpp"
1616
#include "SinglePageVisitor.hpp"
1717
#include "lib/Support/LegibleNames.hpp"
18+
#include "lib/Support/RawOstream.hpp"
19+
#include <llvm/Support/FileSystem.h>
20+
#include <llvm/Support/Path.h>
1821
#include <mrdocs/Metadata/DomMetadata.hpp>
1922
#include <mrdocs/Support/Error.hpp>
2023
#include <mrdocs/Support/Path.hpp>
24+
#include <fstream>
2125
#include <optional>
2226
#include <vector>
2327

@@ -67,9 +71,34 @@ build(
6771
if(! ex)
6872
return ex.error();
6973

70-
MultiPageVisitor visitor(*ex, outputPath, corpus);
74+
std::string path = files::appendPath(outputPath, "reference.tag.xml");
75+
if(auto err = files::createDirectory(outputPath))
76+
{
77+
return err;
78+
}
79+
80+
std::ofstream os;
81+
try
82+
{
83+
os.open(path,
84+
std::ios_base::binary |
85+
std::ios_base::out |
86+
std::ios_base::trunc // | std::ios_base::noreplace
87+
);
88+
}
89+
catch(std::exception const& ex)
90+
{
91+
return formatError("std::ofstream(\"{}\") threw \"{}\"", path, ex.what());
92+
}
93+
94+
RawOstream raw_os(os);
95+
auto tagfileWriter = TagfileWriter(raw_os, corpus);
96+
tagfileWriter.initialize();
97+
98+
MultiPageVisitor visitor(*ex, outputPath, corpus, tagfileWriter);
7199
visitor(corpus.globalNamespace());
72100
auto errors = ex->wait();
101+
tagfileWriter.finalize();
73102
if(! errors.empty())
74103
return Error(errors);
75104
return Error::success();
@@ -79,8 +108,12 @@ Error
79108
HTMLGenerator::
80109
buildOne(
81110
std::ostream& os,
82-
Corpus const& corpus) const
111+
Corpus const& corpus,
112+
std::string_view outputPath) const
83113
{
114+
namespace path = llvm::sys::path;
115+
using SmallString = llvm::SmallString<0>;
116+
84117
HTMLCorpus domCorpus(corpus);
85118
auto ex = createExecutors(domCorpus);
86119
if(! ex)
@@ -98,9 +131,36 @@ buildOne(
98131
if(! errors.empty())
99132
return Error(errors);
100133

101-
SinglePageVisitor visitor(*ex, corpus, os);
134+
SmallString fileName(outputPath);
135+
path::replace_extension(fileName, "tag.xml");
136+
auto parentDir = files::getParentDir(fileName.str());
137+
if(auto err = files::createDirectory(parentDir))
138+
{
139+
return err;
140+
}
141+
142+
std::ofstream osTagfile;
143+
try
144+
{
145+
osTagfile.open(fileName.str().str(),
146+
std::ios_base::binary |
147+
std::ios_base::out |
148+
std::ios_base::trunc // | std::ios_base::noreplace
149+
);
150+
}
151+
catch(std::exception const& ex)
152+
{
153+
return formatError("std::ofstream(\"{}\") threw \"{}\"", fileName.str().str(), ex.what());
154+
}
155+
156+
RawOstream raw_os(osTagfile);
157+
auto tagfileWriter = TagfileWriter(raw_os, corpus);
158+
tagfileWriter.initialize();
159+
160+
SinglePageVisitor visitor(*ex, corpus, os, outputPath, tagfileWriter);
102161
visitor(corpus.globalNamespace());
103162
errors = ex->wait();
163+
tagfileWriter.finalize();
104164
if(! errors.empty())
105165
return Error(errors);
106166

‎src/lib/Gen/html/HTMLGenerator.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ class HTMLGenerator
4949
Error
5050
buildOne(
5151
std::ostream& os,
52-
Corpus const& corpus) const override;
52+
Corpus const& corpus,
53+
std::string_view fileName) const override;
5354
};
5455

5556
} // html

‎src/lib/Gen/html/MultiPageVisitor.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ renderPage(
5050
std::ios_base::trunc // | std::ios_base::noreplace
5151
);
5252
os.write(pageText.data(), pageText.size());
53+
tagfileWriter_(I, fileName);
5354
}
5455
catch(std::exception const& ex)
5556
{

0 commit comments

Comments
 (0)