stamen

Static Menu Generator
git clone git://git.dimitrijedobrota.com/stamen.git
Log | Files | Refs | README | LICENSE | HACKING | CONTRIBUTING | CODE_OF_CONDUCT | BUILDING
commit98b872b2708de3b428418815b77ad9a4bae5f0cf
parent903df3a3cfc31924e986d2ae0ac86a81d3178c54
authorDimitrije Dobrota <mail@dimitrijedobrota.com>
dateWed, 26 Feb 2025 18:26:21 +0100

Use the latest version of Cemplate

Diffstat:
MCMakeLists.txt|+++---
Msource/generate.cpp|++++++++++++++++++++++++++++------------------------------

2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt

@@ -4,7 +4,7 @@ include(cmake/prelude.cmake)

project(
stamen
VERSION 1.2.7
VERSION 1.2.8
DESCRIPTION "Static menu generator"
HOMEPAGE_URL "https://git.dimitrijedobrota.com/stamen"
LANGUAGES C CXX

@@ -13,8 +13,8 @@ project(

include(cmake/project-is-top-level.cmake)
include(cmake/variables.cmake)
find_package(poafloc 1.1 CONFIG REQUIRED)
find_package(cemplate 0.1.7 CONFIG REQUIRED)
find_package(poafloc 1.2 CONFIG REQUIRED)
find_package(cemplate 0.2 CONFIG REQUIRED)
# ---- Declare library ----

diff --git a/source/generate.cpp b/source/generate.cpp

@@ -20,16 +20,16 @@ auto accumulate_items(const stamen::Menu& lmenu)

{
using namespace cemplate; // NOLINT
initlist items;
Initlist items;
for (const auto& [code, prompt, _] : lmenu.items())
{
items.emplace_back(initlist({
string(prompt),
items.emplace_back(Initlist({
String(prompt),
code,
}));
}
return initlist_elem(items);
return InitlistElem(items);
}
void generate_include(std::ostream& ost,

@@ -39,15 +39,15 @@ void generate_include(std::ostream& ost,

using namespace std::string_literals; // NOLINT
using namespace cemplate; // NOLINT
ost << pragma_once();
ost << Pragma("once") << '\n';
ost << include("cstddef");
ost << include("functional");
ost << include("string");
ost << include("vector");
ost << Include("cstddef");
ost << Include("functional");
ost << Include("string");
ost << Include("vector");
ost << '\n';
ost << nspace(args.nspace);
ost << Namespace(args.nspace);
ost << R"(
struct menu_t

@@ -72,16 +72,16 @@ struct menu_t

ost << "// generated function\n";
for (const auto& [code, _] : inst.menu_lookup())
{
ost << func_decl(code, "int", {{{"std::size_t"s, "/* unused */"s}}});
ost << FunctionD(code, "int", {{{"std::size_t"s, "/* unused */"s}}});
}
ost << "\n// free function\n";
for (const auto& [code, _] : inst.free_lookup())
{
ost << func_decl(code, "int", {{{"std::size_t"s, "/* unused */"s}}});
ost << FunctionD(code, "int", {{{"std::size_t"s, "/* unused */"s}}});
}
ost << nspace(args.nspace);
ost << Namespace(args.nspace);
}
void generate_source(std::ostream& ost,

@@ -92,34 +92,31 @@ void generate_source(std::ostream& ost,

using namespace std::string_literals; // NOLINT
using namespace cemplate; // NOLINT
ost << include("cstddef");
ost << '\n';
ost << include(include_name, true);
ost << '\n';
ost << Include("cstddef") << '\n';
ost << IncludeL(include_name) << '\n';
ost << nspace(args.nspace);
ost << Namespace(args.nspace);
// clang-format off
for (const auto& [code, menu] : inst.menu_lookup())
{
ost << func(
ost << Function(
menu.code(),
"extern int",
{{{"std::size_t"s, "/* unused */"s}}}
)
<< decl("static const menu_t", "menu")
<< initlist({
string(menu.title()),
<< Declaration("static const menu_t", "menu",
Initlist({
String(menu.title()),
menu.code(),
accumulate_items(menu),
})
<< ret("menu_t::visit(menu)")
<< func(menu.code());
}))
<< Return("menu_t::visit(menu)")
<< Function(menu.code());
}
// clang-format on
ost << nspace(args.nspace);
ost << Namespace(args.nspace);
}
int parse_opt(int key, const char* arg, poafloc::Parser* parser)

@@ -152,9 +149,10 @@ int parse_opt(int key, const char* arg, poafloc::Parser* parser)

// clang-format off
static const poafloc::option_t options[] {
{nullptr, 0, nullptr, 0, "Output settings", 2},
{"namespace", 'n', "name", 0, "Namespace, C++ only"},
{nullptr},
{ nullptr, 0, nullptr, 0, "Output settings", 2},
{"namespace", 'n', "name", 0, "Name of the nemespace to generate in"},
{ nullptr, 0, nullptr, 0, "Informational Options", -1},
{ nullptr},
};
// clang-format on