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

fix round() function, tests for syntax change, smaller readme fixes

Browse Source
This commit is contained in:
pantor committed 2017-11-15 22:07:55 +01:00
1 parent 00f80eeb56
commit 1eb85fa1a8
6 files changed
+58 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/inja.hpp
+8 -8
View File
@@ -247,7 +247,7 @@ public:
{Function::Lower, Regex{"lower\\(\\s*(.*?)\\s*\\)"}},
{Function::Range, Regex{"range\\(\\s*(.*?)\\s*\\)"}},
{Function::Length, Regex{"length\\(\\s*(.*?)\\s*\\)"}},
{Function::Round, Regex{"length\\(\\s*(.*?)\\s*,\\s*(.*?)\\s*\\)"}},
{Function::Round, Regex{"round\\(\\s*(.*?)\\s*,\\s*(.*?)\\s*\\)"}},
};
Parser() { }
@@ -430,12 +430,12 @@ public:
case Parser::Function::Round: {
const json number = eval_variable(match_function.str(1), data);
const json precision = eval_variable(match_function.str(2), data);
if (not number.is_number()) { throw std::runtime_error("Argument in length function is not a number."); }
if (not precision.is_number()) { throw std::runtime_error("Argument in length function is not a number."); }
if (not number.is_number()) { throw std::runtime_error("Argument in round function is not a number."); }
if (not precision.is_number()) { throw std::runtime_error("Argument in round function is not a number."); }
return std::round(number.get<double>() * std::pow(10.0, precision.get<int>())) / std::pow(10.0, precision.get<int>());
}
}
std::string input_copy = input;
if (input_copy[0] != '/') { input_copy.insert(0, "/"); }
json::json_pointer ptr(input_copy);
@@ -581,13 +581,13 @@ public:
json data = load_json(filename_data);
return render_template(filename, data);
}
void write(const std::string& filename, json data, const std::string& filename_out) {
}
void write(const std::string& filename, const std::string& filename_data, const std::string& filename_out) {
}
std::string load_file(const std::string& filename) {