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

fix read json bug 2

Browse Source
This commit is contained in:
pantor
2017-11-24 07:51:10 +01:00
parent f0311e33e2
commit 570f9fd961
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/inja.hpp
View File

@@ -501,15 +501,15 @@ public:
{Parsed::Function::GreaterEqual, Regex{"(.+) >= (.+)"}},
{Parsed::Function::LessEqual, Regex{"(.+) <= (.+)"}},
{Parsed::Function::Different, Regex{"(.+) != (.+)"}},
{Parsed::Function::Upper, Regex{"upper\\(\\s*(.*?)\\s*\\)"}},
{Parsed::Function::Lower, Regex{"lower\\(\\s*(.*?)\\s*\\)"}},
{Parsed::Function::Range, Regex{"range\\(\\s*(.*?)\\s*\\)"}},
{Parsed::Function::Length, Regex{"length\\(\\s*(.*?)\\s*\\)"}},
{Parsed::Function::Round, Regex{"round\\(\\s*(.*?)\\s*,\\s*(.*?)\\s*\\)"}},
{Parsed::Function::DivisibleBy, Regex{"divisibleBy\\(\\s*(.*?)\\s*,\\s*(.*?)\\s*\\)"}},
{Parsed::Function::Odd, Regex{"odd\\(\\s*(.*?)\\s*\\)"}},
{Parsed::Function::Even, Regex{"even\\(\\s*(.*?)\\s*\\)"}},
{Parsed::Function::ReadJson, Regex{"\\s*([^()]*)\\s*"}}
{Parsed::Function::Upper, Regex{"upper\\(\\s*(.*)\\s*\\)"}},
{Parsed::Function::Lower, Regex{"lower\\(\\s*(.*)\\s*\\)"}},
{Parsed::Function::Range, Regex{"range\\(\\s*(.*)\\s*\\)"}},
{Parsed::Function::Length, Regex{"length\\(\\s*(.*)\\s*\\)"}},
{Parsed::Function::Round, Regex{"round\\(\\s*(.*)\\s*,\\s*(.*)\\s*\\)"}},
{Parsed::Function::DivisibleBy, Regex{"divisibleBy\\(\\s*(.*)\\s*,\\s*(.*)\\s*\\)"}},
{Parsed::Function::Odd, Regex{"odd\\(\\s*(.*)\\s*\\)"}},
{Parsed::Function::Even, Regex{"even\\(\\s*(.*)\\s*\\)"}},
{Parsed::Function::ReadJson, Regex{"\\s*([^()]*?)\\s*"}}
};
Parser() { }

7
test/src/unit-string-helper.cpp
View File

@@ -48,6 +48,13 @@ TEST_CASE("search-with-multiple-possible-regexes") {
CHECK( match.str() == "ipsum" );
CHECK( match.str(1) == "s" );
}
SECTION("basic 3") {
std::vector<inja::Regex> regex_patterns = { inja::Regex("upper\\((.*)\\)"), inja::Regex("lower\\((.*)\\)"), inja::Regex("[^()]*?") };
inja::Match match = inja::search("upper(lower(name))", regex_patterns, 0);
CHECK( match.regex_number() == 0 );
CHECK( match.str(1) == "lower(name)" );
}
}
TEST_CASE("search-on-level") {