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

fix parse bug

Browse Source
This commit is contained in:
pantor
2017-11-22 08:11:18 +01:00
parent bb23f6e6a5
commit 27572db31a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/inja.hpp
+7 -4
View File
@@ -509,7 +509,7 @@ public:
{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::ReadJson, Regex{"\\s*(.*)\\s*"}}
};
Parser() { }
@@ -517,7 +517,7 @@ public:
Parsed::ElementExpression element_function(Parsed::Function func, unsigned int number_args, const Match& match) {
std::vector<Parsed::ElementExpression> args = {};
for (unsigned int i = 0; i < number_args; i++) {
args.push_back( parse_expression(match.str(i + 1)) );
args.push_back( parse_expression(match.str(i + 1)) ); // str(0) is whole group
}
Parsed::ElementExpression result = Parsed::ElementExpression(func);
@@ -583,11 +583,14 @@ public:
return element_function(Parsed::Function::Different, 2, match_function);
}
case Parsed::Function::ReadJson:
default: {
{
Parsed::ElementExpression result = Parsed::ElementExpression(Parsed::Function::ReadJson);
result.command = input;
result.command = match_function.str(1);
return result;
}
default: {
throw std::runtime_error("Parser error: Could not parse input: " + input);
}
}
}