traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use std::tuples in parse regex spec

Browse source 
gcc doesn't let me use initializer list syntax for them
This commit is contained in:
Max Brunsfeld 2014-05-30 13:33:15 -07:00
parent e93e254518
commit c7266f791e
1 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
spec/compiler/prepare_grammar/parse_regex_spec.cc
View file

@ -7,7 +7,13 @@ using namespace rules;
using prepare_grammar::parse_regex;
describe("parsing regex patterns", []() {
vector<tuple<string, string, rule_ptr>> valid_inputs = {
struct ValidInputRow {
string description;
string pattern;
rule_ptr rule;
};
vector<ValidInputRow> valid_inputs = {
{
"character sets",
"[aAeE]",
@ -157,7 +163,13 @@ describe("parsing regex patterns", []() {
}
};
vector<tuple<string, string, const char *>> invalid_inputs = {
struct InvalidInputRow {
string description;
string pattern;
const char *message;
};
vector<InvalidInputRow> invalid_inputs = {
{
"mismatched open parens",
"(a",
@ -190,26 +202,18 @@ describe("parsing regex patterns", []() {
},
};
for (auto &triple : valid_inputs) {
string description = get<0>(triple);
string regex = get<1>(triple);
rule_ptr rule = get<2>(triple);
it(("parses " + description).c_str(), [&]() {
auto result = parse_regex(regex);
AssertThat(result.first, EqualsPointer(rule));
for (auto &row : valid_inputs) {
it(("parses " + row.description).c_str(), [&]() {
auto result = parse_regex(row.pattern);
AssertThat(result.first, EqualsPointer(row.rule));
});
}
for (auto &triple : invalid_inputs) {
string description = get<0>(triple);
string regex = get<1>(triple);
const char *expected_message = get<2>(triple);
it(("handles invalid regexes with " + description).c_str(), [&]() {
auto result = parse_regex(regex);
for (auto &row : invalid_inputs) {
it(("handles invalid regexes with " + row.description).c_str(), [&]() {
auto result = parse_regex(row.pattern);
AssertThat(result.second, !Equals((const GrammarError *)nullptr));
AssertThat(result.second->message, Contains(expected_message));
AssertThat(result.second->message, Contains(row.message));
});
}
});