taixingyiji/subconverter
1
0
Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2025-10-28 04:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhancements

Browse Source 
inja: re-implement exists() to work with JSON pointer for quick usage.
inja: move include scope limit config to ParserConfig.
Optimize codes.
This commit is contained in:
Tindy X
2020-04-04 00:33:44 +08:00
parent bcc4422e87
commit f63420be12
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/inja.hpp
View File

@@ -1594,6 +1594,9 @@ struct LexerConfig {
*/
struct ParserConfig {
ElementNotation notation {ElementNotation::Dot};
/// Extra options for limiting included files' scope
bool include_scope_limit = false;
std::string include_scope = "templates";
};
} // namespace inja
@@ -2684,7 +2687,7 @@ class Parser {
}
// sys::path::remove_dots(pathname, true, sys::path::Style::posix);
if(include_scope_limit)
if(m_config.include_scope_limit)
{
#ifdef _WIN32
if(pathname.find(":\\") != pathname.npos || pathname.find("..") != pathname.npos)
@@ -2693,7 +2696,7 @@ class Parser {
if(pathname.find("/") == 0 || pathname.find("..") != pathname.npos)
inja_throw("file_error", "access denied when trying to include '" + pathname + "': out of scope");
#endif // _WIN32
if(include_scope.size() && pathname.find(include_scope) != 0)
if(m_config.include_scope.size() && pathname.find(m_config.include_scope) != 0)
inja_throw("file_error", "access denied when trying to include '" + pathname + "': out of scope");
}
@@ -2825,11 +2828,6 @@ class Parser {
return text;
}
public:
/// Extra options for limiting included files' scope
bool include_scope_limit = false;
std::string include_scope = "templates";
private:
const ParserConfig& m_config;
Lexer m_lexer;
@@ -3324,7 +3322,18 @@ class Renderer {
}
case Bytecode::Op::Exists: {
auto&& name = get_args(bc)[0]->get_ref<const std::string&>();
bool result = (data.find(name) != data.end());
//bool result = (data.find(name) != data.end());
bool result = false;
try
{
const std::string pointer = "/" + [](std::string str){std::string new_value = "/", old_value = ".";for(std::string::size_type pos(0); pos != std::string::npos; pos += new_value.length()){if((pos = str.find(old_value, pos)) != std::string::npos)str.replace(pos, old_value.length(), new_value);else break;}return str;}(name);
data.at(json::json_pointer(pointer));
result = true;
}
catch (json::out_of_range &e)
{
result = false;
}
pop_args(bc);
m_stack.emplace_back(result);
break;