benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Library: allow quoted values for the test data binding

Browse source 
...hoped to keep it simple, but this is inevitable, since we
want to provide a CSV list as value within a list of key=value
bindings, and all packaged into a simple string for easy testing.

Thus the parsing RegExp just needs two branches for simple and quoted vals
This commit is contained in:
Fischlurch 2024-03-26 00:21:19 +01:00
parent 4e26d655a8
commit 3711bf185c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib/text-template.hpp
View file

@ -126,13 +126,9 @@ namespace lib {
namespace {
/** shorthand for an »iter-explorer« build from some source X */
template<class X>
using ExploreIter = decltype (lib::explore (std::declval<X>()));
//-----------Syntax-for-iteration-control-in-map------
const string MATCH_DATA_TOKEN { R"~(([^,;"\s]*)\s*)~"};
const string MATCH_DELIMITER { R"~((?:^|,|;)\s*)~" };
const string MATCH_DATA_TOKEN = R"~(([^,;"\s]*)\s*)~";
const string MATCH_DELIMITER = R"~((?:^|,|;)\s*)~" ;
const regex ACCEPT_DATA_ELM {MATCH_DELIMITER + MATCH_DATA_TOKEN};
inline auto
@ -143,14 +139,18 @@ namespace lib {
}
//-----------Syntax-for-key-value-data-from-string------
const string MATCH_BINDING_TOK { R"~(([\w\.]+)\s*=\s*([^,;"\s]*)\s*)~"};
const string MATCH_BINDING_KEY = R"~(([\w\.]+))~";
const string MATCH_BINDING_VAL = R"~(([^,;"\s]+)\s*)~";
const string MATCH_QUOTED_VAL = R"~("([^"]+)"\s*)~";
const string MATCH_BINDING_TOK = MATCH_BINDING_KEY+"\\s*=\\s*(?:"+MATCH_BINDING_VAL+"|"+MATCH_QUOTED_VAL+")";
const regex ACCEPT_BINDING_ELM {MATCH_DELIMITER + MATCH_BINDING_TOK};
inline auto
iterBindingSeq (string const& dataDef)
{
return explore (util::RegexSearchIter{dataDef, ACCEPT_BINDING_ELM})
.transform ([&](smatch mat){ return std::make_pair (string{mat[1]},string{mat[2]}); });
.transform ([&](smatch mat){ return std::make_pair (string{mat[1]}
,string{mat[3].matched? mat[3]:mat[2]}); });
}

4
tests/library/text-template-test.cpp
View file

@ -342,8 +342,8 @@ for} tail...
VERIFY_FAIL ("Unbalanced Logic: expect ${end ?? } -- found ...horror ${end |↯|for }"
, TextTemplate::compile("horror ${end for} ever"));
VERIFY_FAIL ("Unbalanced Logic: expect ${end for free} -- found ...${end |↯|if }"
, TextTemplate::compile("horror ${for free}${end if}"));
VERIFY_FAIL ("Unbalanced Logic: expect ${end for free} -- found ... horror ${end |↯|if }"
, TextTemplate::compile("${for free} horror ${end if}"));
VERIFY_FAIL ("Unbalanced Logic: expect ${end for free} -- found ... yet ${end |↯|for me}"
, TextTemplate::compile("${if wee} horror ${for free} yet ${end for me}"));