amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-04-03 14:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings with VS2019, W4, c++20 (#230)

Browse Source 
* fix warnings with VS2019, W4, c++20

* update single include

Co-authored-by: Berscheid <1885260+pantor@users.noreply.github.com>
Co-authored-by: pantor <lars.berscheid@online.de>
This commit is contained in:
Mihai Stan
2022-06-20 13:06:28 +03:00
committed by GitHub
parent 72f90122a2
commit 17a59c0b78
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/inja/parser.hpp
View File

@@ -122,7 +122,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() + "'");
}
@@ -512,7 +512,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()));
@@ -521,7 +521,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()));

4
include/inja/renderer.hpp
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: {

10
single_include/inja/inja.hpp
View File

@@ -1536,7 +1536,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() + "'");
}
@@ -1926,7 +1926,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()));
@@ -1935,7 +1935,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()));
@@ -2428,7 +2428,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: {
@@ -2467,7 +2467,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: {