From 04f75ddbeb666a65a3a8604b5cfaead1977e8c1c Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Mon, 10 Jul 2023 21:09:47 -0300 Subject: [PATCH] refactor: move source files to src --- CMakeLists.txt | 23 +- {lib => src/lib}/-XML/CXXTags.cpp | 0 {lib => src/lib}/-XML/CXXTags.hpp | 4 +- {lib => src/lib}/-XML/XMLGenerator.cpp | 4 +- {lib => src/lib}/-XML/XMLGenerator.hpp | 4 +- {lib => src/lib}/-XML/XMLTags.cpp | 2 +- {lib => src/lib}/-XML/XMLTags.hpp | 4 +- {lib => src/lib}/-XML/XMLWriter.cpp | 8 +- {lib => src/lib}/-XML/XMLWriter.hpp | 6 +- {lib => src/lib}/-adoc/AdocCorpus.cpp | 0 {lib => src/lib}/-adoc/AdocCorpus.hpp | 4 +- {lib => src/lib}/-adoc/AdocGenerator.cpp | 2 +- {lib => src/lib}/-adoc/AdocGenerator.hpp | 4 +- {lib => src/lib}/-adoc/Builder.cpp | 2 +- {lib => src/lib}/-adoc/Builder.hpp | 2 +- {lib => src/lib}/-adoc/MultiPageVisitor.cpp | 0 {lib => src/lib}/-adoc/MultiPageVisitor.hpp | 0 {lib => src/lib}/-adoc/Options.cpp | 4 +- {lib => src/lib}/-adoc/Options.hpp | 4 +- {lib => src/lib}/-adoc/SinglePageVisitor.cpp | 0 {lib => src/lib}/-adoc/SinglePageVisitor.hpp | 0 .../lib}/-bitcode/BitcodeGenerator.cpp | 6 +- .../lib}/-bitcode/BitcodeGenerator.hpp | 4 +- {lib => src/lib}/AST/ASTVisitor.cpp | 6 +- {lib => src/lib}/AST/ASTVisitor.hpp | 8 +- {lib => src/lib}/AST/ASTVisitorHelpers.hpp | 4 +- {lib => src/lib}/AST/AnyBlock.hpp | 8 +- {lib => src/lib}/AST/Bitcode.cpp | 0 {lib => src/lib}/AST/Bitcode.hpp | 4 +- {lib => src/lib}/AST/BitcodeIDs.hpp | 4 +- {lib => src/lib}/AST/BitcodeReader.cpp | 4 +- {lib => src/lib}/AST/BitcodeReader.hpp | 4 +- {lib => src/lib}/AST/BitcodeWriter.cpp | 2 +- {lib => src/lib}/AST/BitcodeWriter.hpp | 4 +- {lib => src/lib}/AST/DecodeRecord.hpp | 4 +- {lib => src/lib}/AST/ParseJavadoc.cpp | 0 {lib => src/lib}/AST/ParseJavadoc.hpp | 6 +- .../lib}/Lib/AbsoluteCompilationDatabase.cpp | 8 +- .../lib}/Lib/AbsoluteCompilationDatabase.hpp | 4 +- {lib => src/lib}/Lib/Config.cpp | 4 +- {lib => src/lib}/Lib/ConfigImpl.cpp | 10 +- {lib => src/lib}/Lib/ConfigImpl.hpp | 6 +- {lib => src/lib}/Lib/Corpus.cpp | 2 +- {lib => src/lib}/Lib/CorpusImpl.cpp | 8 +- {lib => src/lib}/Lib/CorpusImpl.hpp | 10 +- {lib => src/lib}/Lib/Diagnostics.hpp | 4 +- {lib => src/lib}/Lib/ExecutionContext.cpp | 0 {lib => src/lib}/Lib/ExecutionContext.hpp | 4 +- {lib => src/lib}/Lib/SingleFileDB.hpp | 4 +- {lib => src/lib}/Lib/ToolExecutor.cpp | 0 {lib => src/lib}/Lib/ToolExecutor.hpp | 4 +- {lib => src/lib}/Metadata/DomMetadata.cpp | 2 +- {lib => src/lib}/Metadata/Enum.cpp | 0 {lib => src/lib}/Metadata/Function.cpp | 0 {lib => src/lib}/Metadata/Info.cpp | 2 +- {lib => src/lib}/Metadata/Interface.cpp | 2 +- {lib => src/lib}/Metadata/Javadoc.cpp | 2 +- {lib => src/lib}/Metadata/Namespace.cpp | 2 +- {lib => src/lib}/Metadata/Overloads.cpp | 0 {lib => src/lib}/Metadata/Record.cpp | 0 {lib => src/lib}/Metadata/Reduce.cpp | 0 {lib => src/lib}/Metadata/Reduce.hpp | 4 +- {lib => src/lib}/Metadata/Source.cpp | 0 {lib => src/lib}/Metadata/Specifiers.cpp | 0 {lib => src/lib}/Metadata/Symbols.cpp | 0 {lib => src/lib}/Metadata/Template.cpp | 0 {lib => src/lib}/Metadata/Type.cpp | 0 {lib => src/lib}/Metadata/Typedef.cpp | 0 {lib => src/lib}/Support/Debug.cpp | 4 +- {lib => src/lib}/Support/Debug.hpp | 4 +- {lib => src/lib}/Support/Dom.cpp | 0 {lib => src/lib}/Support/Error.cpp | 2 +- {lib => src/lib}/Support/Error.hpp | 0 {lib => src/lib}/Support/ExecutorGroup.cpp | 0 {lib => src/lib}/Support/Generator.cpp | 2 +- {lib => src/lib}/Support/GeneratorsImpl.cpp | 0 {lib => src/lib}/Support/GeneratorsImpl.hpp | 4 +- {lib => src/lib}/Support/Handlebars.cpp | 0 {lib => src/lib}/Support/JavaScript.cpp | 0 {lib => src/lib}/Support/Lua.cpp | 4 +- {lib => src/lib}/Support/LuaHandlebars.cpp | 0 {lib => src/lib}/Support/LuaHandlebars.hpp | 0 {lib => src/lib}/Support/Path.cpp | 0 {lib => src/lib}/Support/Path.hpp | 4 +- {lib => src/lib}/Support/Radix.cpp | 4 +- {lib => src/lib}/Support/Radix.hpp | 4 +- {lib => src/lib}/Support/RawOstream.hpp | 4 +- {lib => src/lib}/Support/SafeNames.cpp | 6 +- {lib => src/lib}/Support/SafeNames.hpp | 4 +- {lib => src/lib}/Support/ThreadPool.cpp | 2 +- {lib => src/lib}/Support/Validate.cpp | 0 {lib => src/lib}/Support/Validate.hpp | 4 +- {lib => src/lib}/Support/Yaml.cpp | 4 +- {lib => src/lib}/Support/Yaml.hpp | 0 {lib => src/lib}/Support/YamlFwd.hpp | 4 +- {lib => src/lib}/clang.natvis | 0 {lib => src/lib}/llvm.natvis | 0 {lib => src/lib}/lua.cpp | 0 {test => src/test}/test_suite/TestArgs.cpp | 0 {test => src/test}/test_suite/TestArgs.hpp | 0 {test => src/test}/test_suite/TestMain.cpp | 4 +- {test => src/test}/test_suite/TestRunner.cpp | 14 +- {test => src/test}/test_suite/TestRunner.hpp | 2 +- .../test}/test_suite/detail/decomposer.cpp | 0 .../test}/test_suite/detail/decomposer.hpp | 10 +- {test => src/test}/test_suite/diff.cpp | 14 +- {test => src/test}/test_suite/diff.hpp | 6 +- {test => src/test}/test_suite/test_suite.cpp | 0 {test => src/test}/test_suite/test_suite.hpp | 4 +- .../test}/unit/Support/Handlebars.cpp | 20 +- {test => src/test}/unit/Support/Path.cpp | 4 +- {tool => src/tool}/Addons.cpp | 0 {tool => src/tool}/Addons.hpp | 0 {tool => src/tool}/GenerateAction.cpp | 8 +- {tool => src/tool}/ToolArgs.cpp | 0 {tool => src/tool}/ToolArgs.hpp | 0 {tool => src/tool}/ToolMain.cpp | 4 +- .../handlebars}/escaped.adoc.hbs | 0 .../handlebars/features_test.adoc.hbs | 0 .../handlebars}/logger_output.txt | 0 .../handlebars}/record-detail.adoc.hbs | 0 .../fixtures/handlebars_features_test.adoc | 840 ------------------ test/unit/fixtures/record.adoc.hbs | 9 - 123 files changed, 187 insertions(+), 1039 deletions(-) rename {lib => src/lib}/-XML/CXXTags.cpp (100%) rename {lib => src/lib}/-XML/CXXTags.hpp (99%) rename {lib => src/lib}/-XML/XMLGenerator.cpp (92%) rename {lib => src/lib}/-XML/XMLGenerator.hpp (93%) rename {lib => src/lib}/-XML/XMLTags.cpp (99%) rename {lib => src/lib}/-XML/XMLTags.hpp (98%) rename {lib => src/lib}/-XML/XMLWriter.cpp (99%) rename {lib => src/lib}/-XML/XMLWriter.hpp (96%) rename {lib => src/lib}/-adoc/AdocCorpus.cpp (100%) rename {lib => src/lib}/-adoc/AdocCorpus.hpp (90%) rename {lib => src/lib}/-adoc/AdocGenerator.cpp (98%) rename {lib => src/lib}/-adoc/AdocGenerator.hpp (92%) rename {lib => src/lib}/-adoc/Builder.cpp (99%) rename {lib => src/lib}/-adoc/Builder.hpp (97%) rename {lib => src/lib}/-adoc/MultiPageVisitor.cpp (100%) rename {lib => src/lib}/-adoc/MultiPageVisitor.hpp (100%) rename {lib => src/lib}/-adoc/Options.cpp (97%) rename {lib => src/lib}/-adoc/Options.hpp (90%) rename {lib => src/lib}/-adoc/SinglePageVisitor.cpp (100%) rename {lib => src/lib}/-adoc/SinglePageVisitor.hpp (100%) rename {lib => src/lib}/-bitcode/BitcodeGenerator.cpp (97%) rename {lib => src/lib}/-bitcode/BitcodeGenerator.hpp (92%) rename {lib => src/lib}/AST/ASTVisitor.cpp (99%) rename {lib => src/lib}/AST/ASTVisitor.hpp (84%) rename {lib => src/lib}/AST/ASTVisitorHelpers.hpp (99%) rename {lib => src/lib}/AST/AnyBlock.hpp (99%) rename {lib => src/lib}/AST/Bitcode.cpp (100%) rename {lib => src/lib}/AST/Bitcode.hpp (97%) rename {lib => src/lib}/AST/BitcodeIDs.hpp (98%) rename {lib => src/lib}/AST/BitcodeReader.cpp (99%) rename {lib => src/lib}/AST/BitcodeReader.hpp (96%) rename {lib => src/lib}/AST/BitcodeWriter.cpp (99%) rename {lib => src/lib}/AST/BitcodeWriter.hpp (98%) rename {lib => src/lib}/AST/DecodeRecord.hpp (98%) rename {lib => src/lib}/AST/ParseJavadoc.cpp (100%) rename {lib => src/lib}/AST/ParseJavadoc.hpp (89%) rename {lib => src/lib}/Lib/AbsoluteCompilationDatabase.cpp (98%) rename {lib => src/lib}/Lib/AbsoluteCompilationDatabase.hpp (93%) rename {lib => src/lib}/Lib/Config.cpp (94%) rename {lib => src/lib}/Lib/ConfigImpl.cpp (97%) rename {lib => src/lib}/Lib/ConfigImpl.hpp (98%) rename {lib => src/lib}/Lib/Corpus.cpp (97%) rename {lib => src/lib}/Lib/CorpusImpl.cpp (97%) rename {lib => src/lib}/Lib/CorpusImpl.hpp (93%) rename {lib => src/lib}/Lib/Diagnostics.hpp (96%) rename {lib => src/lib}/Lib/ExecutionContext.cpp (100%) rename {lib => src/lib}/Lib/ExecutionContext.hpp (92%) rename {lib => src/lib}/Lib/SingleFileDB.hpp (96%) rename {lib => src/lib}/Lib/ToolExecutor.cpp (100%) rename {lib => src/lib}/Lib/ToolExecutor.hpp (96%) rename {lib => src/lib}/Metadata/DomMetadata.cpp (99%) rename {lib => src/lib}/Metadata/Enum.cpp (100%) rename {lib => src/lib}/Metadata/Function.cpp (100%) rename {lib => src/lib}/Metadata/Info.cpp (98%) rename {lib => src/lib}/Metadata/Interface.cpp (99%) rename {lib => src/lib}/Metadata/Javadoc.cpp (99%) rename {lib => src/lib}/Metadata/Namespace.cpp (94%) rename {lib => src/lib}/Metadata/Overloads.cpp (100%) rename {lib => src/lib}/Metadata/Record.cpp (100%) rename {lib => src/lib}/Metadata/Reduce.cpp (100%) rename {lib => src/lib}/Metadata/Reduce.hpp (97%) rename {lib => src/lib}/Metadata/Source.cpp (100%) rename {lib => src/lib}/Metadata/Specifiers.cpp (100%) rename {lib => src/lib}/Metadata/Symbols.cpp (100%) rename {lib => src/lib}/Metadata/Template.cpp (100%) rename {lib => src/lib}/Metadata/Type.cpp (100%) rename {lib => src/lib}/Metadata/Typedef.cpp (100%) rename {lib => src/lib}/Support/Debug.cpp (98%) rename {lib => src/lib}/Support/Debug.hpp (97%) rename {lib => src/lib}/Support/Dom.cpp (100%) rename {lib => src/lib}/Support/Error.cpp (99%) rename {lib => src/lib}/Support/Error.hpp (100%) rename {lib => src/lib}/Support/ExecutorGroup.cpp (100%) rename {lib => src/lib}/Support/Generator.cpp (98%) rename {lib => src/lib}/Support/GeneratorsImpl.cpp (100%) rename {lib => src/lib}/Support/GeneratorsImpl.hpp (93%) rename {lib => src/lib}/Support/Handlebars.cpp (100%) rename {lib => src/lib}/Support/JavaScript.cpp (100%) rename {lib => src/lib}/Support/Lua.cpp (99%) rename {lib => src/lib}/Support/LuaHandlebars.cpp (100%) rename {lib => src/lib}/Support/LuaHandlebars.hpp (100%) rename {lib => src/lib}/Support/Path.cpp (100%) rename {lib => src/lib}/Support/Path.hpp (94%) rename {lib => src/lib}/Support/Radix.cpp (99%) rename {lib => src/lib}/Support/Radix.hpp (92%) rename {lib => src/lib}/Support/RawOstream.hpp (91%) rename {lib => src/lib}/Support/SafeNames.cpp (98%) rename {lib => src/lib}/Support/SafeNames.hpp (95%) rename {lib => src/lib}/Support/ThreadPool.cpp (99%) rename {lib => src/lib}/Support/Validate.cpp (100%) rename {lib => src/lib}/Support/Validate.hpp (90%) rename {lib => src/lib}/Support/Yaml.cpp (95%) rename {lib => src/lib}/Support/Yaml.hpp (100%) rename {lib => src/lib}/Support/YamlFwd.hpp (87%) rename {lib => src/lib}/clang.natvis (100%) rename {lib => src/lib}/llvm.natvis (100%) rename {lib => src/lib}/lua.cpp (100%) rename {test => src/test}/test_suite/TestArgs.cpp (100%) rename {test => src/test}/test_suite/TestArgs.hpp (100%) rename {test => src/test}/test_suite/TestMain.cpp (97%) rename {test => src/test}/test_suite/TestRunner.cpp (97%) rename {test => src/test}/test_suite/TestRunner.hpp (98%) rename {test => src/test}/test_suite/detail/decomposer.cpp (100%) rename {test => src/test}/test_suite/detail/decomposer.hpp (96%) rename {test => src/test}/test_suite/diff.cpp (97%) rename {test => src/test}/test_suite/diff.hpp (94%) rename {test => src/test}/test_suite/test_suite.cpp (100%) rename {test => src/test}/test_suite/test_suite.hpp (99%) rename {test => src/test}/unit/Support/Handlebars.cpp (97%) rename {test => src/test}/unit/Support/Path.cpp (91%) rename {tool => src/tool}/Addons.cpp (100%) rename {tool => src/tool}/Addons.hpp (100%) rename {tool => src/tool}/GenerateAction.cpp (95%) rename {tool => src/tool}/ToolArgs.cpp (100%) rename {tool => src/tool}/ToolArgs.hpp (100%) rename {tool => src/tool}/ToolMain.cpp (97%) rename {test/unit/fixtures => test-files/handlebars}/escaped.adoc.hbs (100%) rename test/unit/fixtures/handlebars_features_test.adoc.hbs => test-files/handlebars/features_test.adoc.hbs (100%) rename {test/unit/fixtures => test-files/handlebars}/logger_output.txt (100%) rename {test/unit/fixtures => test-files/handlebars}/record-detail.adoc.hbs (100%) delete mode 100644 test/unit/fixtures/handlebars_features_test.adoc delete mode 100644 test/unit/fixtures/record.adoc.hbs diff --git a/CMakeLists.txt b/CMakeLists.txt index c359d94b5..8e36c44c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,9 +115,9 @@ find_package(fmt REQUIRED CONFIG) file( GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS - lib/*.cpp - lib/*.hpp - lib/*.natvis + src/lib/*.cpp + src/lib/*.hpp + src/lib/*.natvis include/*.hpp include/*.natvis SourceFileNames.cpp) @@ -128,7 +128,7 @@ target_include_directories(mrdox-core "$" "$" PRIVATE - "${PROJECT_SOURCE_DIR}/lib" + "${PROJECT_SOURCE_DIR}/src" "${PROJECT_SOURCE_DIR}/include") target_compile_definitions( mrdox-core @@ -202,7 +202,7 @@ endif () # #------------------------------------------------- -file(GLOB_RECURSE TOOL_SOURCES CONFIGURE_DEPENDS tool/*.cpp tool/*.hpp) +file(GLOB_RECURSE TOOL_SOURCES CONFIGURE_DEPENDS src/tool/*.cpp src/tool/*.hpp) add_executable(mrdox ${TOOL_SOURCES}) target_compile_definitions(mrdox PRIVATE -DMRDOX_TOOL) @@ -212,8 +212,7 @@ target_include_directories(mrdox "$" PRIVATE "${PROJECT_SOURCE_DIR}/include" - "${PROJECT_SOURCE_DIR}/lib" - "${PROJECT_SOURCE_DIR}/tool" + "${PROJECT_SOURCE_DIR}/src" ) target_compile_definitions(mrdox PRIVATE -DMRDOX_TOOL) @@ -242,21 +241,19 @@ if (MRDOX_BUILD_TESTS) # Unit tests #------------------------------------------------- include(CTest) - file(GLOB_RECURSE TEST_SUITE_FILES CONFIGURE_DEPENDS test/test_suite/*.cpp test/test_suite/*.hpp) - file(GLOB_RECURSE UNIT_TEST_SOURCES CONFIGURE_DEPENDS test/unit/*.cpp test/unit/*.hpp) + file(GLOB_RECURSE TEST_SUITE_FILES CONFIGURE_DEPENDS src/test/test_suite/*.cpp src/test/test_suite/*.hpp) + file(GLOB_RECURSE UNIT_TEST_SOURCES CONFIGURE_DEPENDS src/test/unit/*.cpp src/test/unit/*.hpp) add_executable(mrdox-test ${TEST_SUITE_FILES} ${UNIT_TEST_SOURCES}) target_include_directories(mrdox-test PRIVATE "${PROJECT_SOURCE_DIR}/include" - "${PROJECT_SOURCE_DIR}/lib" - "${PROJECT_SOURCE_DIR}/tool" - "${PROJECT_SOURCE_DIR}/test/test_suite" + "${PROJECT_SOURCE_DIR}/src" ) target_link_libraries(mrdox-test PUBLIC mrdox-core) if (MRDOX_CLANG) target_compile_options(mrdox-test PRIVATE -Wno-covered-switch-default) endif () - target_compile_definitions(mrdox-test PRIVATE -DMRDOX_UNIT_TEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/test/unit") + target_compile_definitions(mrdox-test PRIVATE -DMRDOX_TEST_FILES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/test-files") add_custom_command( # if we run tests, we need the addons in the right place. TARGET mrdox-test diff --git a/lib/-XML/CXXTags.cpp b/src/lib/-XML/CXXTags.cpp similarity index 100% rename from lib/-XML/CXXTags.cpp rename to src/lib/-XML/CXXTags.cpp diff --git a/lib/-XML/CXXTags.hpp b/src/lib/-XML/CXXTags.hpp similarity index 99% rename from lib/-XML/CXXTags.hpp rename to src/lib/-XML/CXXTags.hpp index 376051db4..8a400e524 100644 --- a/lib/-XML/CXXTags.hpp +++ b/src/lib/-XML/CXXTags.hpp @@ -10,8 +10,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_XML_CXXTAGS_HPP -#define MRDOX_TOOL_XML_CXXTAGS_HPP +#ifndef MRDOX_LIB_XML_CXXTAGS_HPP +#define MRDOX_LIB_XML_CXXTAGS_HPP #include "XMLTags.hpp" #include diff --git a/lib/-XML/XMLGenerator.cpp b/src/lib/-XML/XMLGenerator.cpp similarity index 92% rename from lib/-XML/XMLGenerator.cpp rename to src/lib/-XML/XMLGenerator.cpp index a9fb5a1dd..d3646bc44 100644 --- a/lib/-XML/XMLGenerator.cpp +++ b/src/lib/-XML/XMLGenerator.cpp @@ -11,8 +11,8 @@ #include "XMLGenerator.hpp" #include "XMLWriter.hpp" -#include "Support/Radix.hpp" -#include "Support/RawOstream.hpp" +#include "lib/Support/Radix.hpp" +#include "lib/Support/RawOstream.hpp" #include #include diff --git a/lib/-XML/XMLGenerator.hpp b/src/lib/-XML/XMLGenerator.hpp similarity index 93% rename from lib/-XML/XMLGenerator.hpp rename to src/lib/-XML/XMLGenerator.hpp index 61cb74bde..a901ff72b 100644 --- a/lib/-XML/XMLGenerator.hpp +++ b/src/lib/-XML/XMLGenerator.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_XML_XMLGENERATOR_HPP -#define MRDOX_TOOL_XML_XMLGENERATOR_HPP +#ifndef MRDOX_LIB_XML_XMLGENERATOR_HPP +#define MRDOX_LIB_XML_XMLGENERATOR_HPP #include #include diff --git a/lib/-XML/XMLTags.cpp b/src/lib/-XML/XMLTags.cpp similarity index 99% rename from lib/-XML/XMLTags.cpp rename to src/lib/-XML/XMLTags.cpp index e0ab73b3a..1978fc9bf 100644 --- a/lib/-XML/XMLTags.cpp +++ b/src/lib/-XML/XMLTags.cpp @@ -10,7 +10,7 @@ // #include "XMLTags.hpp" -#include "Support/Radix.hpp" +#include "lib/Support/Radix.hpp" #include namespace clang { diff --git a/lib/-XML/XMLTags.hpp b/src/lib/-XML/XMLTags.hpp similarity index 98% rename from lib/-XML/XMLTags.hpp rename to src/lib/-XML/XMLTags.hpp index d4790cf94..4fb23d70c 100644 --- a/lib/-XML/XMLTags.hpp +++ b/src/lib/-XML/XMLTags.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_XML_XMLTAGS_HPP -#define MRDOX_TOOL_XML_XMLTAGS_HPP +#ifndef MRDOX_LIB_XML_XMLTAGS_HPP +#define MRDOX_LIB_XML_XMLTAGS_HPP #include #include diff --git a/lib/-XML/XMLWriter.cpp b/src/lib/-XML/XMLWriter.cpp similarity index 99% rename from lib/-XML/XMLWriter.cpp rename to src/lib/-XML/XMLWriter.cpp index 53f868fd1..01d9bcc6d 100644 --- a/lib/-XML/XMLWriter.cpp +++ b/src/lib/-XML/XMLWriter.cpp @@ -12,10 +12,10 @@ #include "CXXTags.hpp" #include "XMLWriter.hpp" -#include "Lib/ConfigImpl.hpp" -#include "Support/Yaml.hpp" -#include "Support/Radix.hpp" -#include "Support/SafeNames.hpp" +#include "lib/Lib/ConfigImpl.hpp" +#include "lib/Support/Yaml.hpp" +#include "lib/Support/Radix.hpp" +#include "lib/Support/SafeNames.hpp" #include #include #include diff --git a/lib/-XML/XMLWriter.hpp b/src/lib/-XML/XMLWriter.hpp similarity index 96% rename from lib/-XML/XMLWriter.hpp rename to src/lib/-XML/XMLWriter.hpp index 074910f27..3b7e76998 100644 --- a/lib/-XML/XMLWriter.hpp +++ b/src/lib/-XML/XMLWriter.hpp @@ -9,11 +9,11 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_XML_XMLWRITER_HPP -#define MRDOX_TOOL_XML_XMLWRITER_HPP +#ifndef MRDOX_LIB_XML_XMLWRITER_HPP +#define MRDOX_LIB_XML_XMLWRITER_HPP #include "XMLTags.hpp" -#include "Support/YamlFwd.hpp" +#include "lib/Support/YamlFwd.hpp" #include #include #include diff --git a/lib/-adoc/AdocCorpus.cpp b/src/lib/-adoc/AdocCorpus.cpp similarity index 100% rename from lib/-adoc/AdocCorpus.cpp rename to src/lib/-adoc/AdocCorpus.cpp diff --git a/lib/-adoc/AdocCorpus.hpp b/src/lib/-adoc/AdocCorpus.hpp similarity index 90% rename from lib/-adoc/AdocCorpus.hpp rename to src/lib/-adoc/AdocCorpus.hpp index 585e5bf58..048246738 100644 --- a/lib/-adoc/AdocCorpus.hpp +++ b/src/lib/-adoc/AdocCorpus.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_ADOC_ADOCCORPUS_HPP -#define MRDOX_TOOL_ADOC_ADOCCORPUS_HPP +#ifndef MRDOX_LIB_ADOC_ADOCCORPUS_HPP +#define MRDOX_LIB_ADOC_ADOCCORPUS_HPP #include #include diff --git a/lib/-adoc/AdocGenerator.cpp b/src/lib/-adoc/AdocGenerator.cpp similarity index 98% rename from lib/-adoc/AdocGenerator.cpp rename to src/lib/-adoc/AdocGenerator.cpp index b49a74f40..a2837e694 100644 --- a/lib/-adoc/AdocGenerator.cpp +++ b/src/lib/-adoc/AdocGenerator.cpp @@ -14,7 +14,7 @@ #include "Builder.hpp" #include "MultiPageVisitor.hpp" #include "SinglePageVisitor.hpp" -#include "Support/SafeNames.hpp" +#include "lib/Support/SafeNames.hpp" #include #include #include diff --git a/lib/-adoc/AdocGenerator.hpp b/src/lib/-adoc/AdocGenerator.hpp similarity index 92% rename from lib/-adoc/AdocGenerator.hpp rename to src/lib/-adoc/AdocGenerator.hpp index 5bf024251..11ce4bda5 100644 --- a/lib/-adoc/AdocGenerator.hpp +++ b/src/lib/-adoc/AdocGenerator.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_ADOC_ADOCGENERATOR_HPP -#define MRDOX_TOOL_ADOC_ADOCGENERATOR_HPP +#ifndef MRDOX_LIB_ADOC_ADOCGENERATOR_HPP +#define MRDOX_LIB_ADOC_ADOCGENERATOR_HPP #include #include diff --git a/lib/-adoc/Builder.cpp b/src/lib/-adoc/Builder.cpp similarity index 99% rename from lib/-adoc/Builder.cpp rename to src/lib/-adoc/Builder.cpp index 945176a09..648c9deec 100644 --- a/lib/-adoc/Builder.cpp +++ b/src/lib/-adoc/Builder.cpp @@ -9,7 +9,7 @@ // #include "Builder.hpp" -#include "Support/Radix.hpp" +#include "lib/Support/Radix.hpp" #include #include #include diff --git a/lib/-adoc/Builder.hpp b/src/lib/-adoc/Builder.hpp similarity index 97% rename from lib/-adoc/Builder.hpp rename to src/lib/-adoc/Builder.hpp index d8043ff0c..485cdb72b 100644 --- a/lib/-adoc/Builder.hpp +++ b/src/lib/-adoc/Builder.hpp @@ -12,7 +12,7 @@ #define MRDOX_LIB_ADOC_BUILDER_HPP #include "Options.hpp" -#include "Support/Radix.hpp" +#include "lib/Support/Radix.hpp" #include #include #include diff --git a/lib/-adoc/MultiPageVisitor.cpp b/src/lib/-adoc/MultiPageVisitor.cpp similarity index 100% rename from lib/-adoc/MultiPageVisitor.cpp rename to src/lib/-adoc/MultiPageVisitor.cpp diff --git a/lib/-adoc/MultiPageVisitor.hpp b/src/lib/-adoc/MultiPageVisitor.hpp similarity index 100% rename from lib/-adoc/MultiPageVisitor.hpp rename to src/lib/-adoc/MultiPageVisitor.hpp diff --git a/lib/-adoc/Options.cpp b/src/lib/-adoc/Options.cpp similarity index 97% rename from lib/-adoc/Options.cpp rename to src/lib/-adoc/Options.cpp index 5af30fb53..d8737b22d 100644 --- a/lib/-adoc/Options.cpp +++ b/src/lib/-adoc/Options.cpp @@ -10,8 +10,8 @@ // #include "Options.hpp" -#include "Support/Yaml.hpp" -#include "Lib/ConfigImpl.hpp" // VFALCO This is a problem +#include "lib/Support/Yaml.hpp" +#include "lib/Lib/ConfigImpl.hpp" // VFALCO This is a problem #include #include #include diff --git a/lib/-adoc/Options.hpp b/src/lib/-adoc/Options.hpp similarity index 90% rename from lib/-adoc/Options.hpp rename to src/lib/-adoc/Options.hpp index a84614d8d..39cd7c99f 100644 --- a/lib/-adoc/Options.hpp +++ b/src/lib/-adoc/Options.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_ADOC_OPTIONS_HPP -#define MRDOX_TOOL_ADOC_OPTIONS_HPP +#ifndef MRDOX_LIB_ADOC_OPTIONS_HPP +#define MRDOX_LIB_ADOC_OPTIONS_HPP #include #include diff --git a/lib/-adoc/SinglePageVisitor.cpp b/src/lib/-adoc/SinglePageVisitor.cpp similarity index 100% rename from lib/-adoc/SinglePageVisitor.cpp rename to src/lib/-adoc/SinglePageVisitor.cpp diff --git a/lib/-adoc/SinglePageVisitor.hpp b/src/lib/-adoc/SinglePageVisitor.hpp similarity index 100% rename from lib/-adoc/SinglePageVisitor.hpp rename to src/lib/-adoc/SinglePageVisitor.hpp diff --git a/lib/-bitcode/BitcodeGenerator.cpp b/src/lib/-bitcode/BitcodeGenerator.cpp similarity index 97% rename from lib/-bitcode/BitcodeGenerator.cpp rename to src/lib/-bitcode/BitcodeGenerator.cpp index 223883b7f..d0a4f0362 100644 --- a/lib/-bitcode/BitcodeGenerator.cpp +++ b/src/lib/-bitcode/BitcodeGenerator.cpp @@ -10,9 +10,9 @@ // #include "BitcodeGenerator.hpp" -#include "Support/Error.hpp" -#include "Support/SafeNames.hpp" -#include "AST/Bitcode.hpp" +#include "lib/Support/Error.hpp" +#include "lib/Support/SafeNames.hpp" +#include "lib/AST/Bitcode.hpp" #include #include diff --git a/lib/-bitcode/BitcodeGenerator.hpp b/src/lib/-bitcode/BitcodeGenerator.hpp similarity index 92% rename from lib/-bitcode/BitcodeGenerator.hpp rename to src/lib/-bitcode/BitcodeGenerator.hpp index 28b9eb10a..6c6ddfcac 100644 --- a/lib/-bitcode/BitcodeGenerator.hpp +++ b/src/lib/-bitcode/BitcodeGenerator.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_BITCODE_BITCODEGENERATOR_HPP -#define MRDOX_TOOL_BITCODE_BITCODEGENERATOR_HPP +#ifndef MRDOX_LIB_BITCODE_BITCODEGENERATOR_HPP +#define MRDOX_LIB_BITCODE_BITCODEGENERATOR_HPP #include #include diff --git a/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp similarity index 99% rename from lib/AST/ASTVisitor.cpp rename to src/lib/AST/ASTVisitor.cpp index bbb7fd1a5..d6f75415a 100644 --- a/lib/AST/ASTVisitor.cpp +++ b/src/lib/AST/ASTVisitor.cpp @@ -14,9 +14,9 @@ #include "ASTVisitorHelpers.hpp" #include "Bitcode.hpp" #include "ParseJavadoc.hpp" -#include "Support/Path.hpp" -#include "Support/Debug.hpp" -#include "Lib/Diagnostics.hpp" +#include "lib/Support/Path.hpp" +#include "lib/Support/Debug.hpp" +#include "lib/Lib/Diagnostics.hpp" #include #include #include diff --git a/lib/AST/ASTVisitor.hpp b/src/lib/AST/ASTVisitor.hpp similarity index 84% rename from lib/AST/ASTVisitor.hpp rename to src/lib/AST/ASTVisitor.hpp index 578636636..8207c78ae 100644 --- a/lib/AST/ASTVisitor.hpp +++ b/src/lib/AST/ASTVisitor.hpp @@ -10,11 +10,11 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_ASTVISITOR_HPP -#define MRDOX_TOOL_AST_ASTVISITOR_HPP +#ifndef MRDOX_LIB_AST_ASTVISITOR_HPP +#define MRDOX_LIB_AST_ASTVISITOR_HPP -#include "Lib/ConfigImpl.hpp" -#include "Lib/ExecutionContext.hpp" +#include "lib/Lib/ConfigImpl.hpp" +#include "lib/Lib/ExecutionContext.hpp" #include #include #include diff --git a/lib/AST/ASTVisitorHelpers.hpp b/src/lib/AST/ASTVisitorHelpers.hpp similarity index 99% rename from lib/AST/ASTVisitorHelpers.hpp rename to src/lib/AST/ASTVisitorHelpers.hpp index 7fe9f226f..3a6229ea4 100644 --- a/lib/AST/ASTVisitorHelpers.hpp +++ b/src/lib/AST/ASTVisitorHelpers.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_ASTVISITORHELPERS_HPP -#define MRDOX_TOOL_AST_ASTVISITORHELPERS_HPP +#ifndef MRDOX_LIB_AST_ASTVISITORHELPERS_HPP +#define MRDOX_LIB_AST_ASTVISITORHELPERS_HPP #include #include diff --git a/lib/AST/AnyBlock.hpp b/src/lib/AST/AnyBlock.hpp similarity index 99% rename from lib/AST/AnyBlock.hpp rename to src/lib/AST/AnyBlock.hpp index f8488ab54..4d18bdceb 100644 --- a/lib/AST/AnyBlock.hpp +++ b/src/lib/AST/AnyBlock.hpp @@ -10,13 +10,13 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_ANYBLOCK_HPP -#define MRDOX_TOOL_AST_ANYBLOCK_HPP +#ifndef MRDOX_LIB_AST_ANYBLOCK_HPP +#define MRDOX_LIB_AST_ANYBLOCK_HPP #include "BitcodeReader.hpp" #include "DecodeRecord.hpp" -#include "Support/Debug.hpp" -#include "Support/Error.hpp" +#include "lib/Support/Debug.hpp" +#include "lib/Support/Error.hpp" namespace clang { namespace mrdox { diff --git a/lib/AST/Bitcode.cpp b/src/lib/AST/Bitcode.cpp similarity index 100% rename from lib/AST/Bitcode.cpp rename to src/lib/AST/Bitcode.cpp diff --git a/lib/AST/Bitcode.hpp b/src/lib/AST/Bitcode.hpp similarity index 97% rename from lib/AST/Bitcode.hpp rename to src/lib/AST/Bitcode.hpp index be31b2561..0d73ea969 100644 --- a/lib/AST/Bitcode.hpp +++ b/src/lib/AST/Bitcode.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_BITCODE_HPP -#define MRDOX_TOOL_AST_BITCODE_HPP +#ifndef MRDOX_LIB_AST_BITCODE_HPP +#define MRDOX_LIB_AST_BITCODE_HPP #include #include diff --git a/lib/AST/BitcodeIDs.hpp b/src/lib/AST/BitcodeIDs.hpp similarity index 98% rename from lib/AST/BitcodeIDs.hpp rename to src/lib/AST/BitcodeIDs.hpp index e7180743b..c1d71b601 100644 --- a/lib/AST/BitcodeIDs.hpp +++ b/src/lib/AST/BitcodeIDs.hpp @@ -10,8 +10,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_BITCODEIDS_HPP -#define MRDOX_TOOL_AST_BITCODEIDS_HPP +#ifndef MRDOX_LIB_AST_BITCODEIDS_HPP +#define MRDOX_LIB_AST_BITCODEIDS_HPP #include #include diff --git a/lib/AST/BitcodeReader.cpp b/src/lib/AST/BitcodeReader.cpp similarity index 99% rename from lib/AST/BitcodeReader.cpp rename to src/lib/AST/BitcodeReader.cpp index b275c0911..6d94c61de 100644 --- a/lib/AST/BitcodeReader.cpp +++ b/src/lib/AST/BitcodeReader.cpp @@ -12,8 +12,8 @@ #include "BitcodeReader.hpp" #include "AnyBlock.hpp" #include "DecodeRecord.hpp" -#include "Support/Debug.hpp" -#include "Support/Error.hpp" +#include "lib/Support/Debug.hpp" +#include "lib/Support/Error.hpp" #include namespace clang { diff --git a/lib/AST/BitcodeReader.hpp b/src/lib/AST/BitcodeReader.hpp similarity index 96% rename from lib/AST/BitcodeReader.hpp rename to src/lib/AST/BitcodeReader.hpp index 1a01eea15..3637690fe 100644 --- a/lib/AST/BitcodeReader.hpp +++ b/src/lib/AST/BitcodeReader.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_BITCODEREADER_HPP -#define MRDOX_TOOL_AST_BITCODEREADER_HPP +#ifndef MRDOX_LIB_AST_BITCODEREADER_HPP +#define MRDOX_LIB_AST_BITCODEREADER_HPP // // This file implements a reader for parsing the diff --git a/lib/AST/BitcodeWriter.cpp b/src/lib/AST/BitcodeWriter.cpp similarity index 99% rename from lib/AST/BitcodeWriter.cpp rename to src/lib/AST/BitcodeWriter.cpp index 477eca250..723ee526a 100644 --- a/lib/AST/BitcodeWriter.cpp +++ b/src/lib/AST/BitcodeWriter.cpp @@ -13,7 +13,7 @@ #include "BitcodeWriter.hpp" #include "Bitcode.hpp" #include "ParseJavadoc.hpp" -#include "Support/Debug.hpp" +#include "lib/Support/Debug.hpp" #include #include #include diff --git a/lib/AST/BitcodeWriter.hpp b/src/lib/AST/BitcodeWriter.hpp similarity index 98% rename from lib/AST/BitcodeWriter.hpp rename to src/lib/AST/BitcodeWriter.hpp index a2f2c4963..219a655d7 100644 --- a/lib/AST/BitcodeWriter.hpp +++ b/src/lib/AST/BitcodeWriter.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_BITCODEWRITER_HPP -#define MRDOX_TOOL_AST_BITCODEWRITER_HPP +#ifndef MRDOX_LIB_AST_BITCODEWRITER_HPP +#define MRDOX_LIB_AST_BITCODEWRITER_HPP // // This file implements a writer for serializing the diff --git a/lib/AST/DecodeRecord.hpp b/src/lib/AST/DecodeRecord.hpp similarity index 98% rename from lib/AST/DecodeRecord.hpp rename to src/lib/AST/DecodeRecord.hpp index 6946b944b..c9445353a 100644 --- a/lib/AST/DecodeRecord.hpp +++ b/src/lib/AST/DecodeRecord.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_DECODERECORD_HPP -#define MRDOX_TOOL_AST_DECODERECORD_HPP +#ifndef MRDOX_LIB_AST_DECODERECORD_HPP +#define MRDOX_LIB_AST_DECODERECORD_HPP #include "BitcodeReader.hpp" diff --git a/lib/AST/ParseJavadoc.cpp b/src/lib/AST/ParseJavadoc.cpp similarity index 100% rename from lib/AST/ParseJavadoc.cpp rename to src/lib/AST/ParseJavadoc.cpp diff --git a/lib/AST/ParseJavadoc.hpp b/src/lib/AST/ParseJavadoc.hpp similarity index 89% rename from lib/AST/ParseJavadoc.hpp rename to src/lib/AST/ParseJavadoc.hpp index 027a71466..30318d0f1 100644 --- a/lib/AST/ParseJavadoc.hpp +++ b/src/lib/AST/ParseJavadoc.hpp @@ -9,10 +9,10 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_AST_PARSEJAVADOC_HPP -#define MRDOX_TOOL_AST_PARSEJAVADOC_HPP +#ifndef MRDOX_LIB_AST_PARSEJAVADOC_HPP +#define MRDOX_LIB_AST_PARSEJAVADOC_HPP -#include "Lib/Diagnostics.hpp" +#include "lib/Lib/Diagnostics.hpp" #include #include #include diff --git a/lib/Lib/AbsoluteCompilationDatabase.cpp b/src/lib/Lib/AbsoluteCompilationDatabase.cpp similarity index 98% rename from lib/Lib/AbsoluteCompilationDatabase.cpp rename to src/lib/Lib/AbsoluteCompilationDatabase.cpp index 31fd3e64a..60c50196d 100644 --- a/lib/Lib/AbsoluteCompilationDatabase.cpp +++ b/src/lib/Lib/AbsoluteCompilationDatabase.cpp @@ -9,10 +9,10 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Debug.hpp" -#include "Support/Path.hpp" -#include "Lib/ConfigImpl.hpp" -#include "Lib/AbsoluteCompilationDatabase.hpp" +#include "lib/Support/Debug.hpp" +#include "lib/Support/Path.hpp" +#include "lib/Lib/ConfigImpl.hpp" +#include "lib/Lib/AbsoluteCompilationDatabase.hpp" #include #include #include diff --git a/lib/Lib/AbsoluteCompilationDatabase.hpp b/src/lib/Lib/AbsoluteCompilationDatabase.hpp similarity index 93% rename from lib/Lib/AbsoluteCompilationDatabase.hpp rename to src/lib/Lib/AbsoluteCompilationDatabase.hpp index e17f528c9..f1ef7f284 100644 --- a/lib/Lib/AbsoluteCompilationDatabase.hpp +++ b/src/lib/Lib/AbsoluteCompilationDatabase.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_TOOL_ABSOLUTECOMPILATIONDATABASE_HPP -#define MRDOX_TOOL_TOOL_ABSOLUTECOMPILATIONDATABASE_HPP +#ifndef MRDOX_LIB_TOOL_ABSOLUTECOMPILATIONDATABASE_HPP +#define MRDOX_LIB_TOOL_ABSOLUTECOMPILATIONDATABASE_HPP #include #include diff --git a/lib/Lib/Config.cpp b/src/lib/Lib/Config.cpp similarity index 94% rename from lib/Lib/Config.cpp rename to src/lib/Lib/Config.cpp index 770cab413..cc9c4b940 100644 --- a/lib/Lib/Config.cpp +++ b/src/lib/Lib/Config.cpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Lib/ConfigImpl.hpp" -#include "Support/Path.hpp" +#include "lib/Lib/ConfigImpl.hpp" +#include "lib/Support/Path.hpp" #include #include #include diff --git a/lib/Lib/ConfigImpl.cpp b/src/lib/Lib/ConfigImpl.cpp similarity index 97% rename from lib/Lib/ConfigImpl.cpp rename to src/lib/Lib/ConfigImpl.cpp index c52527a2e..04dbe192c 100644 --- a/lib/Lib/ConfigImpl.cpp +++ b/src/lib/Lib/ConfigImpl.cpp @@ -9,11 +9,11 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Lib/ConfigImpl.hpp" -#include "Support/Debug.hpp" -#include "Support/Error.hpp" -#include "Support/Path.hpp" -#include "Support/Yaml.hpp" +#include "lib/Lib/ConfigImpl.hpp" +#include "lib/Support/Debug.hpp" +#include "lib/Support/Error.hpp" +#include "lib/Support/Path.hpp" +#include "lib/Support/Yaml.hpp" #include #include #include diff --git a/lib/Lib/ConfigImpl.hpp b/src/lib/Lib/ConfigImpl.hpp similarity index 98% rename from lib/Lib/ConfigImpl.hpp rename to src/lib/Lib/ConfigImpl.hpp index bc56de97d..dbac98659 100644 --- a/lib/Lib/ConfigImpl.hpp +++ b/src/lib/Lib/ConfigImpl.hpp @@ -9,10 +9,10 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_CONFIGIMPL_HPP -#define MRDOX_TOOL_CONFIGIMPL_HPP +#ifndef MRDOX_LIB_CONFIGIMPL_HPP +#define MRDOX_LIB_CONFIGIMPL_HPP -#include "Support/YamlFwd.hpp" +#include "lib/Support/YamlFwd.hpp" #include #include #include diff --git a/lib/Lib/Corpus.cpp b/src/lib/Lib/Corpus.cpp similarity index 97% rename from lib/Lib/Corpus.cpp rename to src/lib/Lib/Corpus.cpp index 056bf72c7..7f4e60b64 100644 --- a/lib/Lib/Corpus.cpp +++ b/src/lib/Lib/Corpus.cpp @@ -9,7 +9,7 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Lib/ConfigImpl.hpp" +#include "lib/Lib/ConfigImpl.hpp" #include #include #include diff --git a/lib/Lib/CorpusImpl.cpp b/src/lib/Lib/CorpusImpl.cpp similarity index 97% rename from lib/Lib/CorpusImpl.cpp rename to src/lib/Lib/CorpusImpl.cpp index 708777c31..b3ae194be 100644 --- a/lib/Lib/CorpusImpl.cpp +++ b/src/lib/Lib/CorpusImpl.cpp @@ -9,11 +9,11 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "AST/Bitcode.hpp" -#include "AST/ASTVisitor.hpp" +#include "lib/AST/Bitcode.hpp" +#include "lib/AST/ASTVisitor.hpp" #include "CorpusImpl.hpp" -#include "Metadata/Reduce.hpp" -#include "Support/Error.hpp" +#include "lib/Metadata/Reduce.hpp" +#include "lib/Support/Error.hpp" #include #include #include diff --git a/lib/Lib/CorpusImpl.hpp b/src/lib/Lib/CorpusImpl.hpp similarity index 93% rename from lib/Lib/CorpusImpl.hpp rename to src/lib/Lib/CorpusImpl.hpp index 6269992b1..70756121f 100644 --- a/lib/Lib/CorpusImpl.hpp +++ b/src/lib/Lib/CorpusImpl.hpp @@ -8,12 +8,12 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_CORPUSIMPL_HPP -#define MRDOX_TOOL_CORPUSIMPL_HPP +#ifndef MRDOX_LIB_CORPUSIMPL_HPP +#define MRDOX_LIB_CORPUSIMPL_HPP -#include "Lib/ConfigImpl.hpp" -#include "Lib/ToolExecutor.hpp" -#include "Support/Debug.hpp" +#include "lib/Lib/ConfigImpl.hpp" +#include "lib/Lib/ToolExecutor.hpp" +#include "lib/Support/Debug.hpp" #include #include #include diff --git a/lib/Lib/Diagnostics.hpp b/src/lib/Lib/Diagnostics.hpp similarity index 96% rename from lib/Lib/Diagnostics.hpp rename to src/lib/Lib/Diagnostics.hpp index 67cc538ff..ca92f6181 100644 --- a/lib/Lib/Diagnostics.hpp +++ b/src/lib/Lib/Diagnostics.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_TOOL_DIAGNOSTICS_HPP -#define MRDOX_TOOL_TOOL_DIAGNOSTICS_HPP +#ifndef MRDOX_LIB_TOOL_DIAGNOSTICS_HPP +#define MRDOX_LIB_TOOL_DIAGNOSTICS_HPP #include #include diff --git a/lib/Lib/ExecutionContext.cpp b/src/lib/Lib/ExecutionContext.cpp similarity index 100% rename from lib/Lib/ExecutionContext.cpp rename to src/lib/Lib/ExecutionContext.cpp diff --git a/lib/Lib/ExecutionContext.hpp b/src/lib/Lib/ExecutionContext.hpp similarity index 92% rename from lib/Lib/ExecutionContext.hpp rename to src/lib/Lib/ExecutionContext.hpp index 533472848..505836650 100644 --- a/lib/Lib/ExecutionContext.hpp +++ b/src/lib/Lib/ExecutionContext.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_TOOL_EXECUTIONCONTEXT_HPP -#define MRDOX_TOOL_TOOL_EXECUTIONCONTEXT_HPP +#ifndef MRDOX_LIB_TOOL_EXECUTIONCONTEXT_HPP +#define MRDOX_LIB_TOOL_EXECUTIONCONTEXT_HPP #include "Diagnostics.hpp" #include diff --git a/lib/Lib/SingleFileDB.hpp b/src/lib/Lib/SingleFileDB.hpp similarity index 96% rename from lib/Lib/SingleFileDB.hpp rename to src/lib/Lib/SingleFileDB.hpp index 424348a87..cc993577e 100644 --- a/lib/Lib/SingleFileDB.hpp +++ b/src/lib/Lib/SingleFileDB.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SINGLEFILEDB_HPP -#define MRDOX_TOOL_SINGLEFILEDB_HPP +#ifndef MRDOX_LIB_SINGLEFILEDB_HPP +#define MRDOX_LIB_SINGLEFILEDB_HPP #include #include diff --git a/lib/Lib/ToolExecutor.cpp b/src/lib/Lib/ToolExecutor.cpp similarity index 100% rename from lib/Lib/ToolExecutor.cpp rename to src/lib/Lib/ToolExecutor.cpp diff --git a/lib/Lib/ToolExecutor.hpp b/src/lib/Lib/ToolExecutor.hpp similarity index 96% rename from lib/Lib/ToolExecutor.hpp rename to src/lib/Lib/ToolExecutor.hpp index 8e703e4f0..3a03eaeca 100644 --- a/lib/Lib/ToolExecutor.hpp +++ b/src/lib/Lib/ToolExecutor.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_TOOL_TOOLEXECUTOR_HPP -#define MRDOX_TOOL_TOOL_TOOLEXECUTOR_HPP +#ifndef MRDOX_LIB_TOOL_TOOLEXECUTOR_HPP +#define MRDOX_LIB_TOOL_TOOLEXECUTOR_HPP #include "ExecutionContext.hpp" #include diff --git a/lib/Metadata/DomMetadata.cpp b/src/lib/Metadata/DomMetadata.cpp similarity index 99% rename from lib/Metadata/DomMetadata.cpp rename to src/lib/Metadata/DomMetadata.cpp index 654fbb8be..2651e85da 100644 --- a/lib/Metadata/DomMetadata.cpp +++ b/src/lib/Metadata/DomMetadata.cpp @@ -9,7 +9,7 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Radix.hpp" +#include "lib/Support/Radix.hpp" #include #include #include diff --git a/lib/Metadata/Enum.cpp b/src/lib/Metadata/Enum.cpp similarity index 100% rename from lib/Metadata/Enum.cpp rename to src/lib/Metadata/Enum.cpp diff --git a/lib/Metadata/Function.cpp b/src/lib/Metadata/Function.cpp similarity index 100% rename from lib/Metadata/Function.cpp rename to src/lib/Metadata/Function.cpp diff --git a/lib/Metadata/Info.cpp b/src/lib/Metadata/Info.cpp similarity index 98% rename from lib/Metadata/Info.cpp rename to src/lib/Metadata/Info.cpp index 0adf8010b..07af502d8 100644 --- a/lib/Metadata/Info.cpp +++ b/src/lib/Metadata/Info.cpp @@ -9,7 +9,7 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Radix.hpp" +#include "lib/Support/Radix.hpp" #include #include #include diff --git a/lib/Metadata/Interface.cpp b/src/lib/Metadata/Interface.cpp similarity index 99% rename from lib/Metadata/Interface.cpp rename to src/lib/Metadata/Interface.cpp index c69d6f06a..85b415018 100644 --- a/lib/Metadata/Interface.cpp +++ b/src/lib/Metadata/Interface.cpp @@ -9,7 +9,7 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Debug.hpp" +#include "lib/Support/Debug.hpp" #include #include #include diff --git a/lib/Metadata/Javadoc.cpp b/src/lib/Metadata/Javadoc.cpp similarity index 99% rename from lib/Metadata/Javadoc.cpp rename to src/lib/Metadata/Javadoc.cpp index 612b8a168..44638c402 100644 --- a/lib/Metadata/Javadoc.cpp +++ b/src/lib/Metadata/Javadoc.cpp @@ -10,7 +10,7 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Debug.hpp" +#include "lib/Support/Debug.hpp" #include #include #include diff --git a/lib/Metadata/Namespace.cpp b/src/lib/Metadata/Namespace.cpp similarity index 94% rename from lib/Metadata/Namespace.cpp rename to src/lib/Metadata/Namespace.cpp index 72419c975..6120752ee 100644 --- a/lib/Metadata/Namespace.cpp +++ b/src/lib/Metadata/Namespace.cpp @@ -10,7 +10,7 @@ // #include "Reduce.hpp" -#include "Support/Debug.hpp" +#include "lib/Support/Debug.hpp" #include #include #include diff --git a/lib/Metadata/Overloads.cpp b/src/lib/Metadata/Overloads.cpp similarity index 100% rename from lib/Metadata/Overloads.cpp rename to src/lib/Metadata/Overloads.cpp diff --git a/lib/Metadata/Record.cpp b/src/lib/Metadata/Record.cpp similarity index 100% rename from lib/Metadata/Record.cpp rename to src/lib/Metadata/Record.cpp diff --git a/lib/Metadata/Reduce.cpp b/src/lib/Metadata/Reduce.cpp similarity index 100% rename from lib/Metadata/Reduce.cpp rename to src/lib/Metadata/Reduce.cpp diff --git a/lib/Metadata/Reduce.hpp b/src/lib/Metadata/Reduce.hpp similarity index 97% rename from lib/Metadata/Reduce.hpp rename to src/lib/Metadata/Reduce.hpp index 9c43e21dd..2ce9ec55b 100644 --- a/lib/Metadata/Reduce.hpp +++ b/src/lib/Metadata/Reduce.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_METADATA_REDUCE_HPP -#define MRDOX_TOOL_METADATA_REDUCE_HPP +#ifndef MRDOX_LIB_METADATA_REDUCE_HPP +#define MRDOX_LIB_METADATA_REDUCE_HPP #include #include diff --git a/lib/Metadata/Source.cpp b/src/lib/Metadata/Source.cpp similarity index 100% rename from lib/Metadata/Source.cpp rename to src/lib/Metadata/Source.cpp diff --git a/lib/Metadata/Specifiers.cpp b/src/lib/Metadata/Specifiers.cpp similarity index 100% rename from lib/Metadata/Specifiers.cpp rename to src/lib/Metadata/Specifiers.cpp diff --git a/lib/Metadata/Symbols.cpp b/src/lib/Metadata/Symbols.cpp similarity index 100% rename from lib/Metadata/Symbols.cpp rename to src/lib/Metadata/Symbols.cpp diff --git a/lib/Metadata/Template.cpp b/src/lib/Metadata/Template.cpp similarity index 100% rename from lib/Metadata/Template.cpp rename to src/lib/Metadata/Template.cpp diff --git a/lib/Metadata/Type.cpp b/src/lib/Metadata/Type.cpp similarity index 100% rename from lib/Metadata/Type.cpp rename to src/lib/Metadata/Type.cpp diff --git a/lib/Metadata/Typedef.cpp b/src/lib/Metadata/Typedef.cpp similarity index 100% rename from lib/Metadata/Typedef.cpp rename to src/lib/Metadata/Typedef.cpp diff --git a/lib/Support/Debug.cpp b/src/lib/Support/Debug.cpp similarity index 98% rename from lib/Support/Debug.cpp rename to src/lib/Support/Debug.cpp index 5a69ccb46..4d5b5cb17 100644 --- a/lib/Support/Debug.cpp +++ b/src/lib/Support/Debug.cpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Debug.hpp" -#include "Support/Radix.hpp" +#include "lib/Support/Debug.hpp" +#include "lib/Support/Radix.hpp" #include #include #include diff --git a/lib/Support/Debug.hpp b/src/lib/Support/Debug.hpp similarity index 97% rename from lib/Support/Debug.hpp rename to src/lib/Support/Debug.hpp index 90be51c7d..e4cce87ee 100644 --- a/lib/Support/Debug.hpp +++ b/src/lib/Support/Debug.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SUPPORT_DEBUG_HPP -#define MRDOX_TOOL_SUPPORT_DEBUG_HPP +#ifndef MRDOX_LIB_SUPPORT_DEBUG_HPP +#define MRDOX_LIB_SUPPORT_DEBUG_HPP #include #if ! defined(NDEBUG) diff --git a/lib/Support/Dom.cpp b/src/lib/Support/Dom.cpp similarity index 100% rename from lib/Support/Dom.cpp rename to src/lib/Support/Dom.cpp diff --git a/lib/Support/Error.cpp b/src/lib/Support/Error.cpp similarity index 99% rename from lib/Support/Error.cpp rename to src/lib/Support/Error.cpp index a92837e7c..665eff9fc 100644 --- a/lib/Support/Error.cpp +++ b/src/lib/Support/Error.cpp @@ -8,7 +8,7 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Error.hpp" +#include "lib/Support/Error.hpp" #include #include #include diff --git a/lib/Support/Error.hpp b/src/lib/Support/Error.hpp similarity index 100% rename from lib/Support/Error.hpp rename to src/lib/Support/Error.hpp diff --git a/lib/Support/ExecutorGroup.cpp b/src/lib/Support/ExecutorGroup.cpp similarity index 100% rename from lib/Support/ExecutorGroup.cpp rename to src/lib/Support/ExecutorGroup.cpp diff --git a/lib/Support/Generator.cpp b/src/lib/Support/Generator.cpp similarity index 98% rename from lib/Support/Generator.cpp rename to src/lib/Support/Generator.cpp index 209b51b32..b8162f3d7 100644 --- a/lib/Support/Generator.cpp +++ b/src/lib/Support/Generator.cpp @@ -9,7 +9,7 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "AST/ParseJavadoc.hpp" +#include "lib/AST/ParseJavadoc.hpp" #include #include #include diff --git a/lib/Support/GeneratorsImpl.cpp b/src/lib/Support/GeneratorsImpl.cpp similarity index 100% rename from lib/Support/GeneratorsImpl.cpp rename to src/lib/Support/GeneratorsImpl.cpp diff --git a/lib/Support/GeneratorsImpl.hpp b/src/lib/Support/GeneratorsImpl.hpp similarity index 93% rename from lib/Support/GeneratorsImpl.hpp rename to src/lib/Support/GeneratorsImpl.hpp index 8d65ee9b4..5410ce98f 100644 --- a/lib/Support/GeneratorsImpl.hpp +++ b/src/lib/Support/GeneratorsImpl.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SUPPORT_GENERATORSIMPL_HPP -#define MRDOX_TOOL_SUPPORT_GENERATORSIMPL_HPP +#ifndef MRDOX_LIB_SUPPORT_GENERATORSIMPL_HPP +#define MRDOX_LIB_SUPPORT_GENERATORSIMPL_HPP #include #include diff --git a/lib/Support/Handlebars.cpp b/src/lib/Support/Handlebars.cpp similarity index 100% rename from lib/Support/Handlebars.cpp rename to src/lib/Support/Handlebars.cpp diff --git a/lib/Support/JavaScript.cpp b/src/lib/Support/JavaScript.cpp similarity index 100% rename from lib/Support/JavaScript.cpp rename to src/lib/Support/JavaScript.cpp diff --git a/lib/Support/Lua.cpp b/src/lib/Support/Lua.cpp similarity index 99% rename from lib/Support/Lua.cpp rename to src/lib/Support/Lua.cpp index bda10da15..cc0e8e8ea 100644 --- a/lib/Support/Lua.cpp +++ b/src/lib/Support/Lua.cpp @@ -11,11 +11,11 @@ #include #include #include -#include "../../lua/src/lua.hpp" +#include "../../../lua/src/lua.hpp" #include #include -#include "Support/LuaHandlebars.hpp" +#include "lib/Support/LuaHandlebars.hpp" namespace clang { namespace mrdox { diff --git a/lib/Support/LuaHandlebars.cpp b/src/lib/Support/LuaHandlebars.cpp similarity index 100% rename from lib/Support/LuaHandlebars.cpp rename to src/lib/Support/LuaHandlebars.cpp diff --git a/lib/Support/LuaHandlebars.hpp b/src/lib/Support/LuaHandlebars.hpp similarity index 100% rename from lib/Support/LuaHandlebars.hpp rename to src/lib/Support/LuaHandlebars.hpp diff --git a/lib/Support/Path.cpp b/src/lib/Support/Path.cpp similarity index 100% rename from lib/Support/Path.cpp rename to src/lib/Support/Path.cpp diff --git a/lib/Support/Path.hpp b/src/lib/Support/Path.hpp similarity index 94% rename from lib/Support/Path.hpp rename to src/lib/Support/Path.hpp index 8ff17bf86..a3c08af0f 100644 --- a/lib/Support/Path.hpp +++ b/src/lib/Support/Path.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SUPPORT_PATH_HPP -#define MRDOX_TOOL_SUPPORT_PATH_HPP +#ifndef MRDOX_LIB_SUPPORT_PATH_HPP +#define MRDOX_LIB_SUPPORT_PATH_HPP #include #include diff --git a/lib/Support/Radix.cpp b/src/lib/Support/Radix.cpp similarity index 99% rename from lib/Support/Radix.cpp rename to src/lib/Support/Radix.cpp index a0d8d5345..b39adfa1a 100644 --- a/lib/Support/Radix.cpp +++ b/src/lib/Support/Radix.cpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Radix.hpp" -#include "Support/Debug.hpp" +#include "lib/Support/Radix.hpp" +#include "lib/Support/Debug.hpp" #include #include #include diff --git a/lib/Support/Radix.hpp b/src/lib/Support/Radix.hpp similarity index 92% rename from lib/Support/Radix.hpp rename to src/lib/Support/Radix.hpp index 853463d41..4de3f5cf6 100644 --- a/lib/Support/Radix.hpp +++ b/src/lib/Support/Radix.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SUPPORT_RADIX_HPP -#define MRDOX_TOOL_SUPPORT_RADIX_HPP +#ifndef MRDOX_LIB_SUPPORT_RADIX_HPP +#define MRDOX_LIB_SUPPORT_RADIX_HPP #include #include diff --git a/lib/Support/RawOstream.hpp b/src/lib/Support/RawOstream.hpp similarity index 91% rename from lib/Support/RawOstream.hpp rename to src/lib/Support/RawOstream.hpp index c6dc7c1f0..766c62e9b 100644 --- a/lib/Support/RawOstream.hpp +++ b/src/lib/Support/RawOstream.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SUPPORT_RAWOSTREAM_HPP -#define MRDOX_TOOL_SUPPORT_RAWOSTREAM_HPP +#ifndef MRDOX_LIB_SUPPORT_RAWOSTREAM_HPP +#define MRDOX_LIB_SUPPORT_RAWOSTREAM_HPP #include #include diff --git a/lib/Support/SafeNames.cpp b/src/lib/Support/SafeNames.cpp similarity index 98% rename from lib/Support/SafeNames.cpp rename to src/lib/Support/SafeNames.cpp index 67c2337fa..5d67d54fa 100644 --- a/lib/Support/SafeNames.cpp +++ b/src/lib/Support/SafeNames.cpp @@ -8,9 +8,9 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Radix.hpp" -#include "Support/SafeNames.hpp" -#include "Support/Validate.hpp" +#include "lib/Support/Radix.hpp" +#include "lib/Support/SafeNames.hpp" +#include "lib/Support/Validate.hpp" #include #include #include diff --git a/lib/Support/SafeNames.hpp b/src/lib/Support/SafeNames.hpp similarity index 95% rename from lib/Support/SafeNames.hpp rename to src/lib/Support/SafeNames.hpp index 4f0d1629c..6f8be8788 100644 --- a/lib/Support/SafeNames.hpp +++ b/src/lib/Support/SafeNames.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SUPPORT_SAFENAMES_HPP -#define MRDOX_TOOL_SUPPORT_SAFENAMES_HPP +#ifndef MRDOX_LIB_SUPPORT_SAFENAMES_HPP +#define MRDOX_LIB_SUPPORT_SAFENAMES_HPP #include #include diff --git a/lib/Support/ThreadPool.cpp b/src/lib/Support/ThreadPool.cpp similarity index 99% rename from lib/Support/ThreadPool.cpp rename to src/lib/Support/ThreadPool.cpp index 6960fd8ae..4e6b838a0 100644 --- a/lib/Support/ThreadPool.cpp +++ b/src/lib/Support/ThreadPool.cpp @@ -8,7 +8,7 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Debug.hpp" +#include "lib/Support/Debug.hpp" #include #include #include diff --git a/lib/Support/Validate.cpp b/src/lib/Support/Validate.cpp similarity index 100% rename from lib/Support/Validate.cpp rename to src/lib/Support/Validate.cpp diff --git a/lib/Support/Validate.hpp b/src/lib/Support/Validate.hpp similarity index 90% rename from lib/Support/Validate.hpp rename to src/lib/Support/Validate.hpp index d2b60fc09..f562dd050 100644 --- a/lib/Support/Validate.hpp +++ b/src/lib/Support/Validate.hpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SUPPORT_VALIDATE_HPP -#define MRDOX_TOOL_SUPPORT_VALIDATE_HPP +#ifndef MRDOX_LIB_SUPPORT_VALIDATE_HPP +#define MRDOX_LIB_SUPPORT_VALIDATE_HPP #include #include diff --git a/lib/Support/Yaml.cpp b/src/lib/Support/Yaml.cpp similarity index 95% rename from lib/Support/Yaml.cpp rename to src/lib/Support/Yaml.cpp index 7506a401f..3f98fa61b 100644 --- a/lib/Support/Yaml.cpp +++ b/src/lib/Support/Yaml.cpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Error.hpp" -#include "Support/Yaml.hpp" +#include "lib/Support/Error.hpp" +#include "lib/Support/Yaml.hpp" namespace clang { namespace mrdox { diff --git a/lib/Support/Yaml.hpp b/src/lib/Support/Yaml.hpp similarity index 100% rename from lib/Support/Yaml.hpp rename to src/lib/Support/Yaml.hpp diff --git a/lib/Support/YamlFwd.hpp b/src/lib/Support/YamlFwd.hpp similarity index 87% rename from lib/Support/YamlFwd.hpp rename to src/lib/Support/YamlFwd.hpp index fe2537688..73b9748cf 100644 --- a/lib/Support/YamlFwd.hpp +++ b/src/lib/Support/YamlFwd.hpp @@ -9,8 +9,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#ifndef MRDOX_TOOL_SUPPORT_YAMLFWD_HPP -#define MRDOX_TOOL_SUPPORT_YAMLFWD_HPP +#ifndef MRDOX_LIB_SUPPORT_YAMLFWD_HPP +#define MRDOX_LIB_SUPPORT_YAMLFWD_HPP #include diff --git a/lib/clang.natvis b/src/lib/clang.natvis similarity index 100% rename from lib/clang.natvis rename to src/lib/clang.natvis diff --git a/lib/llvm.natvis b/src/lib/llvm.natvis similarity index 100% rename from lib/llvm.natvis rename to src/lib/llvm.natvis diff --git a/lib/lua.cpp b/src/lib/lua.cpp similarity index 100% rename from lib/lua.cpp rename to src/lib/lua.cpp diff --git a/test/test_suite/TestArgs.cpp b/src/test/test_suite/TestArgs.cpp similarity index 100% rename from test/test_suite/TestArgs.cpp rename to src/test/test_suite/TestArgs.cpp diff --git a/test/test_suite/TestArgs.hpp b/src/test/test_suite/TestArgs.hpp similarity index 100% rename from test/test_suite/TestArgs.hpp rename to src/test/test_suite/TestArgs.hpp diff --git a/test/test_suite/TestMain.cpp b/src/test/test_suite/TestMain.cpp similarity index 97% rename from test/test_suite/TestMain.cpp rename to src/test/test_suite/TestMain.cpp index 3186ead6e..df3e42f28 100644 --- a/test/test_suite/TestMain.cpp +++ b/src/test/test_suite/TestMain.cpp @@ -11,8 +11,8 @@ #include "test_suite.hpp" #include "TestArgs.hpp" #include "TestRunner.hpp" -#include "Support/Debug.hpp" -#include "Support/Error.hpp" +#include "lib/Support/Debug.hpp" +#include "lib/Support/Error.hpp" #include #include #include diff --git a/test/test_suite/TestRunner.cpp b/src/test/test_suite/TestRunner.cpp similarity index 97% rename from test/test_suite/TestRunner.cpp rename to src/test/test_suite/TestRunner.cpp index 9af72a025..21f246d03 100644 --- a/test/test_suite/TestRunner.cpp +++ b/src/test/test_suite/TestRunner.cpp @@ -10,13 +10,13 @@ #include "TestRunner.hpp" #include "TestArgs.hpp" -#include "Support/Error.hpp" -#include "Support/Path.hpp" -#include "Lib/AbsoluteCompilationDatabase.hpp" -#include "Lib/ConfigImpl.hpp" -#include "Lib/CorpusImpl.hpp" -#include "Lib/SingleFileDB.hpp" -#include "Lib/ToolExecutor.hpp" +#include "lib/Support/Error.hpp" +#include "lib/Support/Path.hpp" +#include "lib/Lib/AbsoluteCompilationDatabase.hpp" +#include "lib/Lib/ConfigImpl.hpp" +#include "lib/Lib/CorpusImpl.hpp" +#include "lib/Lib/SingleFileDB.hpp" +#include "lib/Lib/ToolExecutor.hpp" #include #include #include diff --git a/test/test_suite/TestRunner.hpp b/src/test/test_suite/TestRunner.hpp similarity index 98% rename from test/test_suite/TestRunner.hpp rename to src/test/test_suite/TestRunner.hpp index 5ccf48057..2bdaf3d53 100644 --- a/test/test_suite/TestRunner.hpp +++ b/src/test/test_suite/TestRunner.hpp @@ -11,7 +11,7 @@ #ifndef MRDOX_TEST_TESTRUNNER_HPP #define MRDOX_TEST_TESTRUNNER_HPP -#include "Lib/ConfigImpl.hpp" +#include "lib/Lib/ConfigImpl.hpp" #include #include #include diff --git a/test/test_suite/detail/decomposer.cpp b/src/test/test_suite/detail/decomposer.cpp similarity index 100% rename from test/test_suite/detail/decomposer.cpp rename to src/test/test_suite/detail/decomposer.cpp diff --git a/test/test_suite/detail/decomposer.hpp b/src/test/test_suite/detail/decomposer.hpp similarity index 96% rename from test/test_suite/detail/decomposer.hpp rename to src/test/test_suite/detail/decomposer.hpp index 3a2f03f59..4e5486052 100644 --- a/test/test_suite/detail/decomposer.hpp +++ b/src/test/test_suite/detail/decomposer.hpp @@ -5,8 +5,8 @@ // https://www.boost.org/LICENSE_1_0.txt // -#ifndef BOOST_URL_EXTRA_TEST_SUITE_DECOMPOSER_HPP -#define BOOST_URL_EXTRA_TEST_SUITE_DECOMPOSER_HPP +#ifndef MRDOX_TEST_DECOMPOSER_HPP +#define MRDOX_TEST_DECOMPOSER_HPP #include #include @@ -15,7 +15,7 @@ #if defined(__has_include) && __has_include() #include #include -#define BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#define MRDOX_TEST_HAS_FMT #endif // These are test macros we can use to test our code without having to @@ -47,7 +47,7 @@ namespace test_suite::detail format_value(T const& value) { std::string out; -#ifdef BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#ifdef MRDOX_TEST_HAS_FMT if constexpr (fmt::has_formatter::value) { out += fmt::format("{}", value); } else @@ -240,4 +240,4 @@ namespace test_suite::detail # define DETAIL_SUPPRESS_PARENTHESES_WARNINGS #endif -#endif //BOOST_URL_EXTRA_TEST_SUITE_DECOMPOSER_HPP +#endif //MRDOX_TEST_DECOMPOSER_HPP diff --git a/test/test_suite/diff.cpp b/src/test/test_suite/diff.cpp similarity index 97% rename from test/test_suite/diff.cpp rename to src/test/test_suite/diff.cpp index b84845e4f..00afa3e81 100644 --- a/test/test_suite/diff.cpp +++ b/src/test/test_suite/diff.cpp @@ -15,7 +15,7 @@ #if defined(__has_include) && __has_include() #include #include -#define BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#define MRDOX_TEST_HAS_FMT #else #include #endif @@ -213,7 +213,7 @@ diffStrings(std::string_view str1, std::string_view str2, std::size_t context_si } if (out_of_context > 0) { -#ifdef BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#ifdef MRDOX_TEST_HAS_FMT result.diff += fmt::format(fmt::fg(fmt::color::gray), "... {} unmodified line(s)\n", out_of_context); #else result.diff += "... " + std::to_string(out_of_context) + " unmodified line(s)\n"; @@ -222,7 +222,7 @@ diffStrings(std::string_view str1, std::string_view str2, std::size_t context_si } if (diffLine.added || diffLine.removed) { -#ifdef BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#ifdef MRDOX_TEST_HAS_FMT result.diff += fmt::format( fmt::fg(diffLine.added ? fmt::color::light_green : fmt::color::orange_red), "{} {}\n", @@ -235,7 +235,7 @@ diffStrings(std::string_view str1, std::string_view str2, std::size_t context_si } else { -#ifdef BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#ifdef MRDOX_TEST_HAS_FMT result.diff += fmt::format("{}\n", diffLine.line); #else result.diff += diffLine.line + '\n'; @@ -244,7 +244,7 @@ diffStrings(std::string_view str1, std::string_view str2, std::size_t context_si } if (out_of_context > 0) { -#ifdef BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#ifdef MRDOX_TEST_HAS_FMT result.diff += fmt::format(fmt::fg(fmt::color::gray), "... {} unmodified line(s)", out_of_context); #else result.diff += "... " + std::to_string(out_of_context) + " unmodified line(s)"; @@ -267,7 +267,7 @@ BOOST_TEST_DIFF( // Write rendered template to file with ofstream std::ofstream out((std::string(expected_contents_path))); BOOST_TEST(out); -#ifdef BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#ifdef MRDOX_TEST_HAS_FMT fmt::println("Parsed template:\n{}", rendered_contents); #else std::cout << "Parsed template:\n" << rendered_contents << std::endl; @@ -284,7 +284,7 @@ BOOST_TEST_DIFF( std::ofstream out((std::string(error_output_path))); BOOST_TEST(out); out << rendered_contents; -#ifdef BOOST_URL_EXTRA_TEST_SUITE_HAS_FMT +#ifdef MRDOX_TEST_HAS_FMT fmt::println("DIFF:\n=====================\n{}\n=====================", diff.diff); #else std::cout << "DIFF:\n=====================\n" << diff.diff << "\n=====================" << std::endl; diff --git a/test/test_suite/diff.hpp b/src/test/test_suite/diff.hpp similarity index 94% rename from test/test_suite/diff.hpp rename to src/test/test_suite/diff.hpp index 9d63747ca..db2585790 100644 --- a/test/test_suite/diff.hpp +++ b/src/test/test_suite/diff.hpp @@ -5,8 +5,8 @@ // https://www.boost.org/LICENSE_1_0.txt // -#ifndef BOOST_URL_EXTRA_TEST_SUITE_DIFF_HPP -#define BOOST_URL_EXTRA_TEST_SUITE_DIFF_HPP +#ifndef MRDOX_TEST_DIFF_HPP +#define MRDOX_TEST_DIFF_HPP #include #include @@ -69,4 +69,4 @@ BOOST_TEST_DIFF( } -#endif //BOOST_URL_EXTRA_TEST_SUITE_DIFF_HPP +#endif //MRDOX_TEST_DIFF_HPP diff --git a/test/test_suite/test_suite.cpp b/src/test/test_suite/test_suite.cpp similarity index 100% rename from test/test_suite/test_suite.cpp rename to src/test/test_suite/test_suite.cpp diff --git a/test/test_suite/test_suite.hpp b/src/test/test_suite/test_suite.hpp similarity index 99% rename from test/test_suite/test_suite.hpp rename to src/test/test_suite/test_suite.hpp index 4e66d77d3..4887e3320 100644 --- a/test/test_suite/test_suite.hpp +++ b/src/test/test_suite/test_suite.hpp @@ -7,8 +7,8 @@ // Official repository: https://github.com/boostorg/url // -#ifndef BOOST_URL_EXTRA_TEST_SUITE_HPP -#define BOOST_URL_EXTRA_TEST_SUITE_HPP +#ifndef MRDOX_TEST_HPP +#define MRDOX_TEST_HPP #if defined(_MSC_VER) # pragma once diff --git a/test/unit/Support/Handlebars.cpp b/src/test/unit/Support/Handlebars.cpp similarity index 97% rename from test/unit/Support/Handlebars.cpp rename to src/test/unit/Support/Handlebars.cpp index ed38c0548..e73d4c76a 100644 --- a/test/unit/Support/Handlebars.cpp +++ b/src/test/unit/Support/Handlebars.cpp @@ -5,9 +5,9 @@ // https://www.boost.org/LICENSE_1_0.txt // -#include "detail/decomposer.hpp" -#include "diff.hpp" -#include "test_suite.hpp" +#include +#include +#include #include #include #include @@ -64,18 +64,18 @@ void setup_fixtures() { master.template_path = - MRDOX_UNIT_TEST_DIR "/fixtures/handlebars_features_test.adoc.hbs"; + MRDOX_TEST_FILES_DIR "/handlebars/features_test.adoc.hbs"; master.partial_paths = { - MRDOX_UNIT_TEST_DIR "/fixtures/record-detail.adoc.hbs", - MRDOX_UNIT_TEST_DIR "/fixtures/escaped.adoc.hbs"}; + MRDOX_TEST_FILES_DIR "/handlebars/record-detail.adoc.hbs", + MRDOX_TEST_FILES_DIR "/handlebars/escaped.adoc.hbs"}; master.output_path = - MRDOX_UNIT_TEST_DIR "/fixtures/handlebars_features_test.adoc"; + MRDOX_TEST_FILES_DIR "/handlebars/features_test.adoc"; master.error_output_path = - MRDOX_UNIT_TEST_DIR "/fixtures/handlebars_features_test_error.adoc"; + MRDOX_TEST_FILES_DIR "/handlebars/features_test_error.adoc"; master.logger_output_path = - MRDOX_UNIT_TEST_DIR "/fixtures/logger_output.txt"; + MRDOX_TEST_FILES_DIR "/handlebars/logger_output.txt"; master.logger_error_output_path = - MRDOX_UNIT_TEST_DIR "/fixtures/logger_output_error.txt"; + MRDOX_TEST_FILES_DIR "/handlebars/logger_output_error.txt"; Expected template_text_r = files::getFileText(master.template_path); diff --git a/test/unit/Support/Path.cpp b/src/test/unit/Support/Path.cpp similarity index 91% rename from test/unit/Support/Path.cpp rename to src/test/unit/Support/Path.cpp index 889266819..ddddcfeb3 100644 --- a/test/unit/Support/Path.cpp +++ b/src/test/unit/Support/Path.cpp @@ -8,8 +8,8 @@ // Official repository: https://github.com/cppalliance/mrdox // -#include "Support/Path.hpp" -#include "test_suite.hpp" +#include "lib/Support/Path.hpp" +#include namespace clang { namespace mrdox { diff --git a/tool/Addons.cpp b/src/tool/Addons.cpp similarity index 100% rename from tool/Addons.cpp rename to src/tool/Addons.cpp diff --git a/tool/Addons.hpp b/src/tool/Addons.hpp similarity index 100% rename from tool/Addons.hpp rename to src/tool/Addons.hpp diff --git a/tool/GenerateAction.cpp b/src/tool/GenerateAction.cpp similarity index 95% rename from tool/GenerateAction.cpp rename to src/tool/GenerateAction.cpp index b28c65bef..0a56fa658 100644 --- a/tool/GenerateAction.cpp +++ b/src/tool/GenerateAction.cpp @@ -10,10 +10,10 @@ // #include "ToolArgs.hpp" -#include "Lib/AbsoluteCompilationDatabase.hpp" -#include "Lib/ConfigImpl.hpp" -#include "Lib/CorpusImpl.hpp" -#include "Lib/ToolExecutor.hpp" +#include "lib/Lib/AbsoluteCompilationDatabase.hpp" +#include "lib/Lib/ConfigImpl.hpp" +#include "lib/Lib/CorpusImpl.hpp" +#include "lib/Lib/ToolExecutor.hpp" #include #include #include diff --git a/tool/ToolArgs.cpp b/src/tool/ToolArgs.cpp similarity index 100% rename from tool/ToolArgs.cpp rename to src/tool/ToolArgs.cpp diff --git a/tool/ToolArgs.hpp b/src/tool/ToolArgs.hpp similarity index 100% rename from tool/ToolArgs.hpp rename to src/tool/ToolArgs.hpp diff --git a/tool/ToolMain.cpp b/src/tool/ToolMain.cpp similarity index 97% rename from tool/ToolMain.cpp rename to src/tool/ToolMain.cpp index 718ba6135..809ef971b 100644 --- a/tool/ToolMain.cpp +++ b/src/tool/ToolMain.cpp @@ -11,8 +11,8 @@ #include "Addons.hpp" #include "ToolArgs.hpp" -#include "Support/Debug.hpp" -#include "Support/Error.hpp" +#include "lib/Support/Debug.hpp" +#include "lib/Support/Error.hpp" #include #include #include diff --git a/test/unit/fixtures/escaped.adoc.hbs b/test-files/handlebars/escaped.adoc.hbs similarity index 100% rename from test/unit/fixtures/escaped.adoc.hbs rename to test-files/handlebars/escaped.adoc.hbs diff --git a/test/unit/fixtures/handlebars_features_test.adoc.hbs b/test-files/handlebars/features_test.adoc.hbs similarity index 100% rename from test/unit/fixtures/handlebars_features_test.adoc.hbs rename to test-files/handlebars/features_test.adoc.hbs diff --git a/test/unit/fixtures/logger_output.txt b/test-files/handlebars/logger_output.txt similarity index 100% rename from test/unit/fixtures/logger_output.txt rename to test-files/handlebars/logger_output.txt diff --git a/test/unit/fixtures/record-detail.adoc.hbs b/test-files/handlebars/record-detail.adoc.hbs similarity index 100% rename from test/unit/fixtures/record-detail.adoc.hbs rename to test-files/handlebars/record-detail.adoc.hbs diff --git a/test/unit/fixtures/handlebars_features_test.adoc b/test/unit/fixtures/handlebars_features_test.adoc deleted file mode 100644 index 80e27ecac..000000000 --- a/test/unit/fixtures/handlebars_features_test.adoc +++ /dev/null @@ -1,840 +0,0 @@ -== from_chars - - - -=== Synopsis - -[,cpp] ----- -std::from_chars ----- - - -Declared in file - - -This is the from_chars function - - - - - - - -// Record detail partial -[,cpp] ----- -struct from_chars -{ -}; ----- - - -// #with to change context -Person: John Doe in page about `from_chars` - - -// #each to iterate, change context, and access parent context -People: -* Person: Alice Doe in page about `from_chars` -* Person: Bob Doe in page about `from_chars` -* Person: Carol Smith in page about `from_chars` - - -== Expressions - -// Render complete context with "." as key -[object Object] - -// Use to_string -{"page":{"kind":"record","name":"from_chars","decl":"std::from_chars","loc":"charconv","javadoc":{"brief":"Converts strings to numbers","details":"This function converts strings to numbers"},"synopsis":"This is the from_chars function","person":{"firstname":"John","lastname":"Doe"},"people":[{"firstname":"Alice","lastname":"Doe","book":[{},{},{},{}]},{"firstname":"Bob","lastname":"Doe","book":[{},{},{},{}]},{"firstname":"Carol","lastname":"Smith","book":[{},{},{},{}]}],"prefix":"Hello","specialChars":"& < > " ' ` =","url":"https://cppalliance.org/","author":{"firstname":"Yehuda","lastname":"Katz"}},"nav":[{"url":"foo","test":true,"title":"bar"},{"url":"bar"}],"myVariable":"lookupMyPartial","myOtherContext":{"information":"Interesting!"},"favoriteNumber":123,"prefix":"Hello","title":"My Title","body":"My Body","story":{"intro":"Before the jump","body":"After the jump"},"comments":[{"subject":"subject 1","body":"body 1"},{"subject":"subject 2","body":"body 2"}],"isActive":true,"isInactive":false,"peopleobj":{"Alice":{"firstname":"Alice","lastname":"Doe"},"Bob":{"firstname":"Bob","lastname":"Doe"},"Carol":{"firstname":"Carol","lastname":"Smith"}},"author":true,"firstname":"Yehuda","lastname":"Katz","names":["Yehuda Katz","Alan Johnson","Charles Jolley"],"namesobj":{"Yehuda":"Yehuda Katz","Alan":"Alan Johnson","Charles":"Charles Jolley"},"city":{"name":"San Francisco","summary":"San Francisco is the cultural center of Northern California","location":{"north":"37.73,","east":"-122.44"},"population":883305},"lookup_test":{"people":["Nils","Yehuda"],"cities":["Darmstadt","San Francisco"]},"lookup_test2":{"persons":[{"name":"Nils","resident-in":"darmstadt"},{"name":"Yehuda","resident-in":"san-francisco"}],"cities":{"darmstadt":{"name":"Darmstadt","country":"Germany"},"san-francisco":{"name":"San Francisco","country":"USA"}}},"containers":{"array":["a","b","c","d","e","f","g"],"array2":["e","f","g","h","i","j","k"],"object":{"a":"a","b":"b","c":"c","d":"d","e":"e","f":"f","g":"g"},"object2":{"e":"e","f":"f","g":"g","h":"h","i":"i","j":"j","k":"k"},"object_array":[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"}]},"symbol":{"tag":"struct","kind":"record","name":"T"}} - -// Literals -true = true -false = false -null = null -undefined = null -./[true] = true -./[false] = false -./[null] = null -./[undefined] = null -'See Website' = See Website -"See Website" = See Website - -// Arrays -Second person is Bob Doe -Second person is Bob Doe - -// Dot segments -Second person is Bob Doe - -// Special characters (disabled for adoc) -raw: & < > " ' ` = -html-escaped: & < > " ' ` = - -// Helpers -JOHN DOE -https://cppalliance.org/[See Website] - -// Helpers with literal values -[source] ----- -** 10% Search -****************** 90% Upload stalled -******************** 100% Finish ----- - -// Undefined helper -Missing: undefinedhelper("Doe") - -// Helpers with hashes -https://chat.asciidoc.org[*project chat*^,role=green] - -// Subexpressions -****************** 90% Upload stalled -****************** 90% Upload stalled - -// Whitespace control -barEmpty - - -// Inline escapes -escaped -true - -// Raw blocks -{{escaped}} - - -// Raw blocks -{{bar}} - - -// Raw block helper -{{BAR}} - - - -== Partials - -// Basic partials -[,cpp] ----- -struct from_chars -{ -}; ----- - -[,cpp] ----- -struct from_chars -{ -}; ----- - - -// Dynamic partials -Dynamo! -Found! - -// Partial context switch -Interesting! - -// Partial parameters -The result is 123 - - Hello, Alice Doe. - Hello, Bob Doe. - Hello, Carol Smith. - - -// Partial blocks - Failover content - - -// Pass templates to partials -Site Content My Content - - -// Inline partials - My Content - My Content - My Content - - -// Block inline partials -
- My Nav -
-
- My Content -
- -== Blocks - -// Block noop -
-

My Title

-
- My Body -
-
- -// Block function -
-

My Title

-
-
My Body
-
-
- -// Block helper parameter -
-

My Title

-
Before the jump
-
After the jump
- -
- -// Simple iterators -
-

My Title

-
Before the jump
-
After the jump
- -
-
-
-

subject 1

- body 1 -
-
-

subject 2

- body 2 -
- -
- -// Custom list helper - - -// Conditionals - Active - - - Active - - - - Inactive - - -// Chained blocks -// 1 - HIT Active 1 - - -// 2 - HIT Active 2 - - -// 3 - - HIT No User - - -// Block hash arguments - - -// Private variables -
  • 0. foo -
  • 1. bar -
- -// Iterate objects - Id: 0, Key: Alice, Name: Alice Doe - Id: 1, Key: Bob, Name: Bob Doe - Id: 2, Key: Carol, Name: Carol Smith - - -// Block parameters - Id: 0 Name: Alice - Id: 1 Name: Bob - Id: 2 Name: Carol - - -// Recursive block parameters - User Id: 0 Book Id: 0 - User Id: 0 Book Id: 1 - User Id: 0 Book Id: 2 - User Id: 0 Book Id: 3 - - User Id: 1 Book Id: 0 - User Id: 1 Book Id: 1 - User Id: 1 Book Id: 2 - User Id: 1 Book Id: 3 - - User Id: 2 Book Id: 0 - User Id: 2 Book Id: 1 - User Id: 2 Book Id: 2 - User Id: 2 Book Id: 3 - - - -== Built-in Helpers - -// Author -

Yehuda Katz

- - -// Unknown -
- -

Unknown Author

- -
- -// Include zero -

Does render

- - - -

Does render

- - -// Custom -author defined -value2 undefined - -// unless -
-

WARNING: This entry does not have a license!

- -
- -// each with non objects -
    -
  • Yehuda Katz
    • -
  • Alan Johnson
    • -
  • Charles Jolley
    • - -
- -// No paragraphs - -

No paragraphs

- - -// indexes and keys - 0: Yehuda Katz 1: Alan Johnson 2: Charles Jolley - Yehuda: Yehuda Katz Alan: Alan Johnson Charles: Charles Jolley - -// with -Yehuda Katz - - -// with block parameters - San Francisco: 37.73, -122.44 - - - -// with inverse - -No city found - - -// lookup - -Nils lives in Darmstadt -Yehuda lives in San Francisco - - -// lookup2 - Nils lives in Darmstadt (Germany) - - Yehuda lives in San Francisco (USA) - - - -// log (there should be no rendered output) - - - - - - - - -== Hooks - -// Helper missing -Missing: foo() -Missing: foo(true) -Missing: foo(2, true) -Missing: foo(true) -Helper 'foo' not found. Printing block: block content - -// Block helper missing -Helper 'person' not found. Printing block: Yehuda Katz - - -== String helpers - -// capitalize -Hello world! -Hello world! -Hello world! -Hello world! -// center - Hello world! - Hello world! --------------------Hello world!------------------- --------------------Hello world!------------------- -// ljust -Hello world! -Hello world! -Hello world!-------------------------------------- -Hello world!-------------------------------------- -// pad_end -Hello world! -Hello world! -Hello world!-------------------------------------- -Hello world!-------------------------------------- -// rjust - Hello world! - Hello world! ---------------------------------------Hello world! ---------------------------------------Hello world! -// pad_start - Hello world! - Hello world! ---------------------------------------Hello world! ---------------------------------------Hello world! -// count -2 -2 -1 -1 -1 -1 -// ends_with -true -true -true -true -true -true -false -false -// starts_with -true -true -true -true -true -true -false -false -// expandtabs -Hello world! -Hello world! -Hello world! -Hello world! -Helloworld! -Helloworld! -// find -6 -6 -// index_of -6 -6 -// includes -true -true -false -false -// rfind --1 --1 --1 --1 -// rindex_of --1 --1 --1 --1 -// last_index_of --1 --1 --1 --1 -// at -e -e -// char_at -e -e -// isalnum -true -true -false -false -// isalpha -true -true -true -true -false -false -// isascii -true -true -// isdecimal -false -false -true -true -// isdigit -false -false -true -true -// islower -false -false -false -false -// isupper -false -false -false -false -// isprintable -true -true -false -false -// isspace -false -false -true -true -true -true -// istitle -false -false -true -true -// upper -HELLO WORLD! -HELLO WORLD! -// to_upper -HELLO WORLD! -HELLO WORLD! -// lower -hello world! -hello world! -// to_lower -hello world! -hello world! -// swapcase -hELLO WORLD! -hELLO WORLD! -// join -Hello,world! -Hello,world! -// concat -Hello world!,Bye! -Hello world!,Bye! -// strip -Hello world! -Hello world! -Hello world! -Hello world! -// trim -Hello world! -Hello world! -Hello world! -Hello world!--------' -// lstrip -Hello world! -Hello world! -Hello world!-------- -Hello world!-------- -// trim_start -Hello world! -Hello world! -Hello world!-------- -Hello world!-------- -// rstrip - Hello world! - Hello world! ---------Hello world! ---------Hello world! -// trim_end - Hello world! - Hello world! ---------Hello world! ---------Hello world! -// partition -[Hello, ,world!] -[Hello, ,world!] -[Hello world!,,] -[Hello world!,,] -// rpartition -[Hello, ,world!] -[Hello, ,world!] -[Hello world!,,] -[Hello world!,,] -// remove_prefix - world! - world! -// remove_suffix -Hello -Hello -Hello world -Hello world -// replace -Hello! -Hello! -// split -[Hello,world!] -[Hello,world!] -[He,] -[He,] -// rsplit -[world!,Hell] -[world!,Hell] -[d!,o wo] -[d!,o wo] -// splitlines -[Hello world!\nBye!] -[Hello world!\nBye!] -// zfill -00000000000000000000000000000000000000Hello world! -00000000000000000000000000000000000000Hello world! -00000000000000000000000000000000000000000000000000000000000000000000000000000030 -00000000000000000000000000000000000000000000000000000000000000000000000000000030 --0000000000000000000000000000000000000000000000000000000000000000000000000000030 --0000000000000000000000000000000000000000000000000000000000000000000000000000030 -// repeat -Hello world!Hello world!Hello world! -Hello world!Hello world!Hello world! -// escape -Hello world! -Hello world! -<Hello world!></Hello> -<Hello world!></Hello> -// slice -ello -ello -ello world! -ello world! -ello world -ello world -ell -ell -// substr -ello -ello -ello world! -ello world! -ello world -ello world -ell -ell -// safe_anchor_id -hello-world! -hello-world! -// strip_namespace -Hello world! -Hello world! -memory_order -memory_order -memory_order_acquire -memory_order_acquire -basic_string -basic_string - -== Containers - -// size -7 -7 -3 -// len -7 -7 -3 -// keys - -[a,b,c,d,e,f,g] - -// list - -list helper requires array argument: object provided - -// iter - -[a,b,c,d,e,f,g] - -// values -[a,b,c,d,e,f,g] -[a,b,c,d,e,f,g] -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"}] -// del -[a,b,d,e,f,g] -{"a":"a","b":"b","d":"d","e":"e","f":"f","g":"g"} -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"}] -// delete -[a,b,d,e,f,g] -{"a":"a","b":"b","d":"d","e":"e","f":"f","g":"g"} -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"}] -// has -true -true -false -// exist -true -false -true -false -false -// contains -true -false -true -false -false -// has_any -true -false -false -true -false -false -false -// exist_any -true -true -false -// contains_any -true -true -false -// get -c -c -{"account_id":"account-x11","product":"Desk"} -// get_or -y -y -y -// items -[a,b,c,d,e,f,g] -[[a,a],[b,b],[c,c],[d,d],[e,e],[f,f],[g,g]] -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"}] -// entries -[a,b,c,d,e,f,g] -[[a,a],[b,b],[c,c],[d,d],[e,e],[f,f],[g,g]] -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"}] -// first -a -"a" -{"account_id":"account-x10","product":"Chair"} -// head -a -"a" -{"account_id":"account-x10","product":"Chair"} -// front -a -"a" -{"account_id":"account-x10","product":"Chair"} -// last -g -"g" -{"account_id":"account-x11","product":"Desk"} -// tail -g -"g" -{"account_id":"account-x11","product":"Desk"} -// back -g -"g" -{"account_id":"account-x11","product":"Desk"} -// reverse -[g,f,e,d,c,b,a] -[["g","g"],["f","f"],["e","e"],["d","d"],["c","c"],["b","b"],["a","a"]] -[{"account_id":"account-x11","product":"Desk"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x10","product":"Chair"}] -// reversed -[g,f,e,d,c,b,a] -[["g","g"],["f","f"],["e","e"],["d","d"],["c","c"],["b","b"],["a","a"]] -[{"account_id":"account-x11","product":"Desk"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x10","product":"Chair"}] -// update -[a,b,c,d,e,f,g,h,i,j,k] -{"e":"e","f":"f","g":"g","h":"h","i":"i","j":"j","k":"k","a":"a","b":"b","c":"c","d":"d"} -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"},"e","f","g","h","i","j","k"] -// merge -[a,b,c,d,e,f,g,h,i,j,k] -{"e":"e","f":"f","g":"g","h":"h","i":"i","j":"j","k":"k","a":"a","b":"b","c":"c","d":"d"} -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"},"e","f","g","h","i","j","k"] -// sort -[a,b,c,d,e,f,g] -{"a":"a","b":"b","c":"c","d":"d","e":"e","f":"f","g":"g"} -[{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x11","product":"Desk"}] -// sort_by - - -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"}] -// at -c -c -{"account_id":"account-x11","product":"Desk"} -// fill -[a,b,-,-,-,f,g] -[a,b,-,-,-,-,g] - - -// count -1 -1 -0 -// concat -[a,b,c,d,e,f,g,e,f,g,h,i,j,k] -[object Object] -[[object Object],[object Object],[object Object],e,f,g,h,i,j,k] -// replace -[a,b,d,d,e,f,g] -[a,b,d,d,e,f,g] -{"c":"d","a":"a","b":"b","c":"c","d":"d","e":"e","f":"f"} -[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"},{"account_id":"account-x11","product":"Desk"}] -// chunk -[[a,b,c],[d,e,f],[g]] -[{"a":"a","b":"b","c":"c"},{"d":"d","e":"e","f":"f"},{"g":"g"}] -[[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"}],[{"account_id":"account-x11","product":"Desk"}]] -// group_by - - -{"account-x10":[{"account_id":"account-x10","product":"Chair"},{"account_id":"account-x10","product":"Bookcase"}],"account-x11":[{"account_id":"account-x11","product":"Desk"}]} -{"Chair":[{"account_id":"account-x10","product":"Chair"}],"Bookcase":[{"account_id":"account-x10","product":"Bookcase"}],"Desk":[{"account_id":"account-x11","product":"Desk"}]} -// pluck - - -["account-x10","account-x10","account-x11"] -["Chair","Bookcase","Desk"] -// unique -["a","b","c","d","e","f","g","h","i","j","k"] - - - -// Inverse block with no helper expands expressions - - struct T - - - diff --git a/test/unit/fixtures/record.adoc.hbs b/test/unit/fixtures/record.adoc.hbs deleted file mode 100644 index f63dca3aa..000000000 --- a/test/unit/fixtures/record.adoc.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{#if symbol.template}} - {{>template-head symbol.template}} - {{symbol.tag}} {{symbol.name~}} - {{#if (neq symbol.template.kind "primary")~}} - {{>template-args args=symbol.template.args}} - {{/if}} -{{else}} - {{symbol.tag}} {{symbol.name~}} -{{/if}}