Use WCCLFile parsing in data-droven tag rule and match rule tests

tests/datarule.cpp

@@ -165,29 +165,21 @@ void test_one_rule_item_actual(const rule_compare_test& c)
 	std::ifstream is(rf.c_str());
 	BOOST_REQUIRE(is.good());
 
+	boost::shared_ptr<Wccl::WcclFile> parsed;
+	parsed = parser.parseWcclFile(is, LIBWCCL_TEST_DATA_DIR);
 
-	boost::shared_ptr<Wccl::TagRuleSequence> rules;
-	boost::shared_ptr<Wccl::MatchRule> matchr;
-
-	std::string fn = c.rule_file.filename();
-	if (fn.find("match") == fn.npos) {
-		rules = parser.parseTagRuleSequence(is);
-	} else {
-		matchr = parser.parseMatchRule(is);
-	}
 	for (size_t i = 0; i < chunk->sentences().size(); ++i) {
 		Corpus2::Sentence::Ptr sentence = chunk->sentences()[i]->clone_shared();
 		Corpus2::Sentence::Ptr expected_sentence = expected->sentences()[i];
 		BOOST_REQUIRE_EQUAL(sentence->size(), expected_sentence->size());
-		if (rules) {
-			rules->execute_once(sentence);
-		} else if (matchr) {
+		if (parsed->has_tag_rules()) {
+			parsed->get_tag_rules_ptr()->execute_once(sentence);
+		}
+		if (parsed->has_match_rules()) {
 			boost::shared_ptr<Corpus2::AnnotatedSentence> annotated;
 			annotated = boost::dynamic_pointer_cast<Corpus2::AnnotatedSentence>(sentence);
 			BOOST_REQUIRE(annotated);
-			matchr->apply(annotated);
-		} else {
-			BOOST_ERROR("Dark forces");
+			parsed->get_match_rules_ptr()->apply_all(annotated);
 		}
 		check_sentences(i, tagset, sentence, expected_sentence);
 	}

tests/rules-data/match/head/cclmatch1.ccl

+match_rules(
 apply
 (
   match
@@ -11,3 +12,4 @@ apply
     mark(M, M, :2, "NP")
   )
 )
+)

tests/rules-data/match/is/cclmatch-is1.ccl

+match_rules(
 apply(
   match(
     is('N_NOM')
@@ -6,3 +7,4 @@ apply(
     mark(M, 'COPY')
   )
 )
+)

tests/rules-data/match/michal/cclmatch1.ccl

+match_rules(
 apply(
   match(
     regex( base[0], 'wyżyna' ),
@@ -14,3 +15,4 @@ apply(
   )
 )
 
+)

tests/rules-data/match/michal/cclmatch2.ccl

+match_rules(
 
 
 apply(
@@ -13,3 +14,4 @@ apply(
   )
 )
 
+)

tests/rules-data/match/michal/cclmatch3.ccl

+match_rules(
 apply(
   match(
     is( 'city_trigger' ),
@@ -10,3 +11,4 @@ apply(
     mark(:2, 'CITY_NAM')
   )
 )
+)

tests/rules-data/match/postcond/cclmatch1.ccl

+match_rules(
 apply(
   match(
     inter( base[0], 'wyżyna' ),
@@ -12,3 +13,4 @@ apply(
     mark(:2, 'Highland')
   )
 )
+)

tests/rules-data/match/postcond/cclmatch2.ccl

+match_rules(
 apply(
   match(
     inter( base[0], 'wyżyna' ),
@@ -12,3 +13,4 @@ apply(
     mark(:2, 'Highland')
   )
 )
+)

tests/rules-data/match/postcond2/cclmatch-none.ccl

+match_rules(
 apply(
   match(
     is("A")
@@ -9,3 +10,4 @@ apply(
     mark(M, "C")
   )
 )
+)

tests/rules-data/match/postcond2/cclmatch2.ccl

+match_rules(
 apply(
   match(
     is("B")
@@ -9,3 +10,4 @@ apply(
     mark(M, "C")
   )
 )
+)

tests/rules-data/match/postcond2/cclmatch3.ccl

+match_rules(
 apply(
   match(repeat(equal(class[0], adj))),
   cond(ann(M, "B")),
   actions(mark(M,"C"))
 )
+)

tests/rules-data/match/postcond2/cclmatch4.ccl

+match_rules(
 apply(
   match(repeat(equal(class[0], adj))),
   cond(annsub(M, "B")),
   actions(mark(M,"C"))
 )
+)

tests/rules-data/match/postcond2/cclmatch5.ccl

+match_rules(
 apply(
   match(
     repeat(
@@ -12,3 +13,4 @@ apply(
   //cond(debug(orth[first(M)])),
   actions(mark(M,"C"))
 )
+)

tests/rules-data/match/postcond3/cclmatch1.ccl

+match_rules(
 apply(
   match(
     optional(repeat(inter(class[0], {adj}))),
@@ -10,3 +11,4 @@ apply(
     mark(M, "NP")
   )
 )
+)

tests/rules-data/match/postcond3/cclmatch2.ccl

+match_rules(
 apply(
   match(
     optional(repeat(inter(class[0], {adj}))),
@@ -10,3 +11,4 @@ apply(
     mark(M, "NP")
   )
 )
+)

tests/rules-data/match/repeat/cclmatch3.ccl

+match_rules(
 apply(
   match(
     optional(repeat(inter(class[0], {adj, pact, ppas}))),
@@ -7,3 +8,4 @@ apply(
     mark(M, 'NP')
   )
 )
+)

tests/rules-data/match/repeat/cclmatch4.ccl

+match_rules(
 apply(
   match(
     repeat(
@@ -10,3 +11,4 @@ apply(
     mark(M, 'MultiNP')
   )
 )
+)

tests/rules-data/match/single_tok/cclmatch1.ccl

+match_rules(
 apply(
   match(
     and( inter(class[0], {subst, ger, depr}), inter(cas[0], {nom}) )
@@ -6,3 +7,4 @@ apply(
     mark($m:_M, 'N_NOM')
   )
 )
+)

tests/rules-data/match/text/cclmatch1.ccl

+match_rules(
 apply(
   match(
     text("Sp. z o.o.")
@@ -6,3 +7,4 @@ apply(
     mark(M, "Co")
   )
 )
+)

tests/rules-data/match/text/cclmatch2.ccl

+match_rules(
 apply(
   match(
     text("Sp."),
@@ -10,3 +11,4 @@ apply(
     mark(:3, "O")
   )
 )
+)