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

calculate length of strings with length function

Browse Source
This commit is contained in:
pantor
2019-04-07 13:27:43 +02:00
parent 3afc7f30cd
commit 6698e98ea3
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/inja/renderer.hpp
+12 -4
View File
@@ -180,11 +180,11 @@ class Renderer {
}
case Bytecode::Op::PrintValue: {
const json& val = *get_args(bc)[0];
if (val.is_string())
if (val.is_string()) {
os << val.get_ref<const std::string&>();
else
} else {
os << val.dump();
// val.dump(os);
}
pop_args(bc);
break;
}
@@ -215,7 +215,15 @@ class Renderer {
break;
}
case Bytecode::Op::Length: {
auto result = get_args(bc)[0]->size();
const json& val = *get_args(bc)[0];
int result;
if (val.is_string()) {
result = val.get_ref<const std::string&>().length();
} else {
result = val.size();
}
pop_args(bc);
m_stack.emplace_back(result);
break;
single_include/inja/inja.hpp
+12 -4
View File
@@ -2786,11 +2786,11 @@ class Renderer {
}
case Bytecode::Op::PrintValue: {
const json& val = *get_args(bc)[0];
if (val.is_string())
if (val.is_string()) {
os << val.get_ref<const std::string&>();
else
} else {
os << val.dump();
// val.dump(os);
}
pop_args(bc);
break;
}
@@ -2821,7 +2821,15 @@ class Renderer {
break;
}
case Bytecode::Op::Length: {
auto result = get_args(bc)[0]->size();
const json& val = *get_args(bc)[0];
int result;
if (val.is_string()) {
result = val.get_ref<const std::string&>().length();
} else {
result = val.size();
}
pop_args(bc);
m_stack.emplace_back(result);
break;
test/unit-renderer.cpp
+4 -2
View File
@@ -73,7 +73,7 @@ TEST_CASE("types") {
SECTION("nested loops") {
auto ldata = json::parse(
R"DELIM(
{ "outer" : [
{ "outer" : [
{ "inner" : [
{ "in2" : [ 1, 2 ] },
{ "in2" : []},
@@ -170,7 +170,9 @@ TEST_CASE("functions") {
}
SECTION("length") {
CHECK( env.render("{{ length(names) }}", data) == "4" );
CHECK( env.render("{{ length(names) }}", data) == "4" ); // Length of array
CHECK( env.render("{{ length(name) }}", data) == "5" ); // Length of string
// CHECK_THROWS_WITH( env.render("{{ length(5) }}", data), "[inja.exception.json_error] [json.exception.type_error.302] type must be array, but is number" );
}