amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-04-15 12:38:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

use get_argument function in callbacks

Browse Source
This commit is contained in:
pantor
2018-02-18 18:56:35 +01:00
parent 693bf63493
commit f931a95800
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/inja.hpp
View File

@@ -193,7 +193,6 @@ inline MatchType<T> match(const std::string& input, std::map<T, Regex> regexes)
return match;
}
}
// throw std::runtime_error("Could not match input: " + input);
return match;
}
@@ -447,7 +446,7 @@ public:
case Parsed::Function::Default: {
try {
return eval_expression(element.args[0], data);
} catch (std::exception e) {
} catch (std::exception& exception) {
return eval_expression(element.args[1], data);
}
}
@@ -842,17 +841,22 @@ public:
return parser.load_file(input_path + filename);
}
void add_callback(std::string name, int number_arguments, std::function<json(Parsed::Arguments, json)> callback) {
parser.regex_map_callbacks[name] = Parser::function_regex(name, number_arguments);
renderer.map_callbacks[name] = callback;
}
json load_json(const std::string& filename) {
std::ifstream file(input_path + filename);
json j;
file >> j;
return j;
}
void add_callback(std::string name, int number_arguments, std::function<json(Parsed::Arguments, json)> callback) {
parser.regex_map_callbacks[name] = Parser::function_regex(name, number_arguments);
renderer.map_callbacks[name] = callback;
}
template<typename T>
T get_argument(Parsed::Arguments args, int index, json data) {
return renderer.eval_expression<T>(args[index], data);
}
};