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

Fix line statements

Browse Source
This commit is contained in:
pantor
2018-03-19 12:20:12 +01:00
parent 561f8cf59e
commit e38df0931f
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/inja.hpp
+3 -3
View File
@@ -30,7 +30,7 @@ SOFTWARE.
#define PANTOR_INJA_VERSION_MAJOR 1
#define PANTOR_INJA_VERSION_MINOR 0
#define PANTOR_INJA_VERSION_PATCH 0
#define PANTOR_INJA_VERSION_PATCH 1
#ifndef NLOHMANN_JSON_HPP
@@ -630,7 +630,7 @@ public:
std::map<Parsed::Delimiter, Regex> regex_map_delimiters = {
{Parsed::Delimiter::Statement, Regex{"\\{\\%\\s*(.+?)\\s*\\%\\}"}},
{Parsed::Delimiter::LineStatement, Regex{"(?:^|\\n)##\\s*(.+)\\s*"}},
{Parsed::Delimiter::LineStatement, Regex{"(?:^|\\n)## *(.+?) *(?:\\n|$)"}},
{Parsed::Delimiter::Expression, Regex{"\\{\\{\\s*(.+?)\\s*\\}\\}"}},
{Parsed::Delimiter::Comment, Regex{"\\{#\\s*(.*?)\\s*#\\}"}}
};
@@ -925,7 +925,7 @@ public:
}
void set_line_statement(const std::string& open) {
parser.regex_map_delimiters[Parsed::Delimiter::LineStatement] = Regex{"(?:^|\\n)" + open + "\\s*(.+)\\s*"};
parser.regex_map_delimiters[Parsed::Delimiter::LineStatement] = Regex{"(?:^|\\n)" + open + " *(.+?) *(?:\\n|$)"};
}
void set_expression(const std::string& open, const std::string& close) {