matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored cppidx generator name to json

Browse Source
This commit is contained in:
Bartek Kryza
2023-03-13 22:14:26 +01:00
parent bffe9913aa
commit 19ae58f493
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/class_diagram/generators/cppidx/class_diagram_generator.cc → src/class_diagram/generators/json/class_diagram_generator.cc
View File

@@ -1,5 +1,5 @@
/** /**
* src/class_diagram/generators/cppidx/class_diagram_generator.cc * src/class_diagram/generators/json/class_diagram_generator.cc
* *
* Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com> * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
* *
@@ -20,7 +20,7 @@
#include "util/error.h" #include "util/error.h"
namespace clanguml::class_diagram::generators::cppidx { namespace clanguml::class_diagram::generators::json {
generator::generator(diagram_config &config, diagram_model &model) generator::generator(diagram_config &config, diagram_model &model)
: common_generator<diagram_config, diagram_model>{config, model} : common_generator<diagram_config, diagram_model>{config, model}

10
src/class_diagram/generators/cppidx/class_diagram_generator.h → src/class_diagram/generators/json/class_diagram_generator.h
View File

@@ -1,5 +1,5 @@
/** /**
* src/class_diagram/generators/cppidx/class_diagram_generator.h * src/class_diagram/generators/json/class_diagram_generator.h
* *
* Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com> * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
* *
@@ -22,7 +22,7 @@
#include "class_diagram/model/diagram.h" #include "class_diagram/model/diagram.h"
#include "class_diagram/model/enum.h" #include "class_diagram/model/enum.h"
#include "class_diagram/visitor/translation_unit_visitor.h" #include "class_diagram/visitor/translation_unit_visitor.h"
#include "common/generators/cppidx/generator.h" #include "common/generators/json/generator.h"
#include "common/generators/nested_element_stack.h" #include "common/generators/nested_element_stack.h"
#include "common/model/relationship.h" #include "common/model/relationship.h"
#include "config/config.h" #include "config/config.h"
@@ -39,12 +39,12 @@
namespace clanguml { namespace clanguml {
namespace class_diagram { namespace class_diagram {
namespace generators { namespace generators {
namespace cppidx { namespace json {
using diagram_config = clanguml::config::class_diagram; using diagram_config = clanguml::config::class_diagram;
using diagram_model = clanguml::class_diagram::model::diagram; using diagram_model = clanguml::class_diagram::model::diagram;
template <typename C, typename D> template <typename C, typename D>
using common_generator = clanguml::common::generators::cppidx::generator<C, D>; using common_generator = clanguml::common::generators::json::generator<C, D>;
using clanguml::class_diagram::model::class_; using clanguml::class_diagram::model::class_;
using clanguml::class_diagram::model::class_element; using clanguml::class_diagram::model::class_element;
@@ -72,7 +72,7 @@ private:
mutable nlohmann::json json_; mutable nlohmann::json json_;
}; };
} // namespace cppidx } // namespace json
} // namespace generators } // namespace generators
} // namespace class_diagram } // namespace class_diagram
} // namespace clanguml } // namespace clanguml

2
src/cli/cli_handler.cc
View File

@@ -61,7 +61,7 @@ cli_flow_t cli_handler::parse(int argc, const char **argv)
static const std::map<std::string, clanguml::common::generator_type_t> static const std::map<std::string, clanguml::common::generator_type_t>
generator_type_names{ generator_type_names{
{"plantuml", clanguml::common::generator_type_t::plantuml}, {"plantuml", clanguml::common::generator_type_t::plantuml},
{"cppidx", clanguml::common::generator_type_t::cppidx}}; {"json", clanguml::common::generator_type_t::json}};
app.add_option("-c,--config", config_path, app.add_option("-c,--config", config_path,
"Location of configuration file, when '-' read from stdin"); "Location of configuration file, when '-' read from stdin");

6
src/common/generators/generators.h
View File

@@ -17,7 +17,7 @@
*/ */
#pragma once #pragma once
#include "class_diagram/generators/cppidx/class_diagram_generator.h" #include "class_diagram/generators/json/class_diagram_generator.h"
#include "class_diagram/generators/plantuml/class_diagram_generator.h" #include "class_diagram/generators/plantuml/class_diagram_generator.h"
#include "cli/cli_handler.h" #include "cli/cli_handler.h"
#include "common/generators/generators.h" #include "common/generators/generators.h"
@@ -237,12 +237,12 @@ void generate_diagram(const std::string &od, const std::string &name,
LOG_INFO("Written {} diagram to {}", name, path.string()); LOG_INFO("Written {} diagram to {}", name, path.string());
} }
else if (generator_type == generator_type_t::cppidx) { else if (generator_type == generator_type_t::json) {
auto path = auto path =
std::filesystem::path{od} / fmt::format("{}.json", name); std::filesystem::path{od} / fmt::format("{}.json", name);
std::ofstream ofs; std::ofstream ofs;
ofs.open(path, std::ofstream::out | std::ofstream::trunc); ofs.open(path, std::ofstream::out | std::ofstream::trunc);
ofs << clanguml::class_diagram::generators::cppidx::generator( ofs << clanguml::class_diagram::generators::json::generator(
dynamic_cast<diagram_config &>(*diagram), *model); dynamic_cast<diagram_config &>(*diagram), *model);
ofs.close(); ofs.close();

6
src/common/generators/cppidx/generator.h → src/common/generators/json/generator.h
View File

@@ -1,5 +1,5 @@
/** /**
* src/common/generators/cppidx/generator.h * src/common/generators/json/generator.h
* *
* Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com> * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
* *
@@ -29,7 +29,7 @@
#include <ostream> #include <ostream>
namespace clanguml::common::generators::cppidx { namespace clanguml::common::generators::json {
using clanguml::common::model::access_t; using clanguml::common::model::access_t;
using clanguml::common::model::element; using clanguml::common::model::element;
@@ -83,4 +83,4 @@ std::ostream &operator<<(
return os; return os;
} }
} // namespace clanguml::common::generators::cppidx } // namespace clanguml::common::generators::json

2
src/common/types.h
View File

@@ -27,7 +27,7 @@ namespace clanguml::common {
using id_t = int64_t; using id_t = int64_t;
enum class generator_type_t { plantuml, cppidx }; enum class generator_type_t { plantuml, json };
template <typename T> class optional_ref { template <typename T> class optional_ref {
public: public: