Skip to content

Commit 12fc21a

Browse files
committed
xml and adoc namespaces
1 parent 2391d32 commit 12fc21a

File tree

10 files changed

+24
-37
lines changed

10 files changed

+24
-37
lines changed
File renamed without changes.

source/lib/format/asciidoc/Asciidoc.cpp renamed to source/lib/_adoc/Asciidoc.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
namespace clang {
1919
namespace mrdox {
20+
namespace adoc {
2021

2122
//------------------------------------------------
2223
//
@@ -873,12 +874,15 @@ toString(TagTypeKind k) noexcept
873874
}
874875
}
875876

877+
} // adoc
878+
879+
876880
//------------------------------------------------
877881

878882
std::unique_ptr<Generator>
879883
makeAsciidocGenerator()
880884
{
881-
return std::make_unique<AsciidocGenerator>();
885+
return std::make_unique<adoc::AsciidocGenerator>();
882886
}
883887

884888
} // mrdox

source/lib/format/asciidoc/Asciidoc.hpp renamed to source/lib/_adoc/Asciidoc.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// Official repository: https://github.com/cppalliance/mrdox
1010
//
1111

12-
#ifndef MRDOX_SOURCE_FORMAT_ASCIIDOC_HPP
13-
#define MRDOX_SOURCE_FORMAT_ASCIIDOC_HPP
12+
#ifndef MRDOX_SOURCE_ADOC_ASCIIDOC_HPP
13+
#define MRDOX_SOURCE_ADOC_ASCIIDOC_HPP
1414

1515
#include <mrdox/Config.hpp>
1616
#include <mrdox/Corpus.hpp>
@@ -25,8 +25,7 @@
2525

2626
namespace clang {
2727
namespace mrdox {
28-
29-
struct OverloadSet;
28+
namespace adoc {
3029

3130
class AsciidocGenerator
3231
: public Generator
@@ -141,6 +140,7 @@ class AsciidocGenerator::Writer
141140
static llvm::StringRef toString(TagTypeKind k) noexcept;
142141
};
143142

143+
} // adoc
144144
} // mrdox
145145
} // clang
146146

source/lib/format/asciidoc/PagesBuilder.cpp renamed to source/lib/_adoc/PagesBuilder.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
namespace clang {
1919
namespace mrdox {
20+
namespace adoc {
2021

2122
/*
2223
Pages are as follows:
@@ -143,5 +144,6 @@ visit(
143144
return true;
144145
}
145146

147+
} // adoc
146148
} // mrdox
147149
} // clang

source/lib/format/asciidoc/PagesBuilder.hpp renamed to source/lib/_adoc/PagesBuilder.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88
// Official repository: https://github.com/cppalliance/mrdox
99
//
1010

11-
#ifndef MRDOX_SOURCE_FORMAT_ASCIIDOC_PAGESBUILDER_HPP
12-
#define MRDOX_SOURCE_FORMAT_ASCIIDOC_PAGESBUILDER_HPP
11+
#ifndef MRDOX_SOURCE_ADOC_PAGESBUILDER_HPP
12+
#define MRDOX_SOURCE_ADOC_PAGESBUILDER_HPP
1313

1414
#include <mrdox/Corpus.hpp>
1515
#include <mrdox/MetadataFwd.hpp>
1616
#include <llvm/ADT/SmallString.h>
1717

1818
namespace clang {
1919
namespace mrdox {
20+
namespace adoc {
2021

2122
class PagesBuilder : Corpus::Visitor
2223
{
@@ -56,6 +57,7 @@ class PagesBuilder : Corpus::Visitor
5657
llvm::SmallString<0> filePrefix_;
5758
};
5859

60+
} // adoc
5961
} // mrdox
6062
} // clang
6163

source/lib/format/xml/XML.cpp renamed to source/lib/_xml/XML.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
//
1111

1212
#include "XML.hpp"
13-
#include "format/radix.hpp"
13+
#include "radix.hpp"
1414
#include <mrdox/Error.hpp>
1515
#include <mrdox/Metadata.hpp>
1616

1717
namespace clang {
1818
namespace mrdox {
19-
20-
namespace {
19+
namespace xml {
2120

2221
//------------------------------------------------
2322
//
@@ -98,8 +97,6 @@ write(
9897
}
9998
}
10099

101-
} // (anon)
102-
103100
//------------------------------------------------
104101
//
105102
// XMLGenerator
@@ -968,12 +965,14 @@ toString(
968965
}
969966
}
970967

968+
} // xml
969+
971970
//------------------------------------------------
972971

973972
std::unique_ptr<Generator>
974973
makeXMLGenerator()
975974
{
976-
return std::make_unique<XMLGenerator>();
975+
return std::make_unique<xml::XMLGenerator>();
977976
}
978977

979978
} // mrdox

source/lib/format/xml/XML.hpp renamed to source/lib/_xml/XML.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99
// Official repository: https://github.com/cppalliance/mrdox
1010
//
1111

12-
#ifndef MRDOX_SOURCE_FORMAT_XML_HPP
13-
#define MRDOX_SOURCE_FORMAT_XML_HPP
12+
#ifndef MRDOX_SOURCE_XML_XML_HPP
13+
#define MRDOX_SOURCE_XML_XML_HPP
1414

1515
#include <mrdox/Generator.hpp>
1616
#include <mrdox/MetadataFwd.hpp>
1717
#include <mrdox/meta/Javadoc.hpp>
1818

1919
namespace clang {
2020
namespace mrdox {
21+
namespace xml {
2122

2223
//------------------------------------------------
2324

@@ -150,6 +151,7 @@ class XMLGenerator::Writer
150151

151152
//------------------------------------------------
152153

154+
} // xml
153155
} // mrdox
154156
} // clang
155157

source/lib/format/asciidoc/Links.hpp

Lines changed: 0 additions & 22 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)