amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-05-19 02:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pantor/inja

Browse Source
This commit is contained in:
pantor
2022-07-10 13:46:36 +02:00
parent 9f923b3677 17a59c0b78
commit edc17798b3
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/inja/parser.hpp
+3 -3
View File
@@ -126,7 +126,7 @@ class Parser {
}
}
std::string parse_filename(const Token& tok) const {
std::string parse_filename() const {
if (tok.kind != Token::Kind::String) {
throw_parser_error("expected string, got '" + tok.describe() + "'");
}
@@ -516,7 +516,7 @@ class Parser {
} else if (tok.text == static_cast<decltype(tok.text)>("include")) {
get_next_token();
std::string template_name = parse_filename(tok);
std::string template_name = parse_filename();
add_to_template_storage(path, template_name);
current_block->nodes.emplace_back(std::make_shared<IncludeStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
@@ -525,7 +525,7 @@ class Parser {
} else if (tok.text == static_cast<decltype(tok.text)>("extends")) {
get_next_token();
std::string template_name = parse_filename(tok);
std::string template_name = parse_filename();
add_to_template_storage(path, template_name);
current_block->nodes.emplace_back(std::make_shared<ExtendsStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
include/inja/renderer.hpp
+2 -2
View File
@@ -352,7 +352,7 @@ class Renderer : public NodeVisitor {
} break;
case Op::Lower: {
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
std::transform(result.begin(), result.end(), result.begin(), ::tolower);
std::transform(result.begin(), result.end(), result.begin(), [](char c) { return static_cast<char>(::tolower(c)); });
make_result(std::move(result));
} break;
case Op::Max: {
@@ -391,7 +391,7 @@ class Renderer : public NodeVisitor {
} break;
case Op::Upper: {
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
std::transform(result.begin(), result.end(), result.begin(), ::toupper);
std::transform(result.begin(), result.end(), result.begin(), [](char c) { return static_cast<char>(::toupper(c)); });
make_result(std::move(result));
} break;
case Op::IsBoolean: {
single_include/inja/inja.hpp
+5 -5
View File
@@ -1540,7 +1540,7 @@ class Parser {
}
}
std::string parse_filename(const Token& tok) const {
std::string parse_filename() const {
if (tok.kind != Token::Kind::String) {
throw_parser_error("expected string, got '" + tok.describe() + "'");
}
@@ -1930,7 +1930,7 @@ class Parser {
} else if (tok.text == static_cast<decltype(tok.text)>("include")) {
get_next_token();
std::string template_name = parse_filename(tok);
std::string template_name = parse_filename();
add_to_template_storage(path, template_name);
current_block->nodes.emplace_back(std::make_shared<IncludeStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
@@ -1939,7 +1939,7 @@ class Parser {
} else if (tok.text == static_cast<decltype(tok.text)>("extends")) {
get_next_token();
std::string template_name = parse_filename(tok);
std::string template_name = parse_filename();
add_to_template_storage(path, template_name);
current_block->nodes.emplace_back(std::make_shared<ExtendsStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
@@ -2432,7 +2432,7 @@ class Renderer : public NodeVisitor {
} break;
case Op::Lower: {
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
std::transform(result.begin(), result.end(), result.begin(), ::tolower);
std::transform(result.begin(), result.end(), result.begin(), [](char c) { return static_cast<char>(::tolower(c)); });
make_result(std::move(result));
} break;
case Op::Max: {
@@ -2471,7 +2471,7 @@ class Renderer : public NodeVisitor {
} break;
case Op::Upper: {
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
std::transform(result.begin(), result.end(), result.begin(), ::toupper);
std::transform(result.begin(), result.end(), result.begin(), [](char c) { return static_cast<char>(::toupper(c)); });
make_result(std::move(result));
} break;
case Op::IsBoolean: {