amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-03-28 03:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve lexing of numbers

Browse Source
This commit is contained in:
pantor
2021-11-17 12:13:22 +01:00
parent b41524f129
commit b2c0dddafe
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/inja/lexer.hpp
View File

@@ -197,7 +197,7 @@ class Lexer {
}
const char ch = m_in[pos];
// be very permissive in lexer (we'll catch errors when conversion happens)
if (!std::isdigit(ch) && ch != '.' && ch != 'e' && ch != 'E' && ch != '+' && ch != '-') {
if (!(std::isdigit(ch) || ch == '.' || ch == 'e' || ch == 'E' || (ch == '+' && (pos == 0 || m_in[pos-1] == 'e' || m_in[pos-1] == 'E')) || (ch == '-' && (pos == 0 || m_in[pos-1] == 'e' || m_in[pos-1] == 'E')))) {
break;
}
pos += 1;

2
single_include/inja/inja.hpp
View File

@@ -1184,7 +1184,7 @@ class Lexer {
}
const char ch = m_in[pos];
// be very permissive in lexer (we'll catch errors when conversion happens)
if (!std::isdigit(ch) && ch != '.' && ch != 'e' && ch != 'E' && ch != '+' && ch != '-') {
if (!(std::isdigit(ch) || ch == '.' || ch == 'e' || ch == 'E' || (ch == '+' && (pos == 0 || m_in[pos-1] == 'e' || m_in[pos-1] == 'E')) || (ch == '-' && (pos == 0 || m_in[pos-1] == 'e' || m_in[pos-1] == 'E')))) {
break;
}
pos += 1;

11
test/test-functions.cpp
View File

@@ -18,13 +18,24 @@ TEST_CASE("functions") {
data["vars"] = {2, 3, 4, 0, -1, -2, -3};
SUBCASE("math") {
CHECK(env.render("{{ 1e3 }}", data) == "1000.0");
CHECK(env.render("{{ 1e+3 }}", data) == "1000.0");
CHECK(env.render("{{ 1e-3 }}", data) == "0.001");
CHECK(env.render("{{1.0}}", data) == "1.0");
CHECK(env.render("{{ -1 }}", data) == "-1");
CHECK(env.render("{{1e0}}", data) == "1.0");
CHECK(env.render("{{ 1 + 1 }}", data) == "2");
CHECK(env.render("{{ 1+3 }}", data) == "4");
CHECK(env.render("{{ 1-3 }}", data) == "-2");
CHECK(env.render("{{ 3 - 21 }}", data) == "-18");
CHECK(env.render("{{ 1 + 1 * 3 }}", data) == "4");
CHECK(env.render("{{ (1 + 1) * 3 }}", data) == "6");
CHECK(env.render("{{ 5 / 2 }}", data) == "2.5");
CHECK(env.render("{{ 5^3 }}", data) == "125");
CHECK(env.render("{{ 5 + 12 + 4 * (4 - (1 + 1))^2 - 75 * 1 }}", data) == "-42");
CHECK_THROWS_WITH(env.render("{{ +1 }}", data), "[inja.exception.render_error] (at 1:4) empty expression");
}
SUBCASE("upper") {