change rule -> tag_rule in syntax, make parser rule names explicit about this

libwccl/parser/Parser.cpp

@@ -411,7 +411,7 @@ boost::shared_ptr<TagRuleSequence> Parser::parseTagRuleSequence(
 }
 
 /**
- * @desc Parse a sequence rules. Runs parse_rule_sequence rule in the parser
+ * @desc Parse a sequence rules. Runs parse_tag_rule_sequence rule in the parser
  *       grammar.
  * @arg istr input stream with writed rules
  * @return the parsed rule sequence via a shared pointer
@@ -424,7 +424,7 @@ boost::shared_ptr<TagRuleSequence> Parser::parseTagRuleSequence(
 	boost::shared_ptr<TagRuleSequence> res;
 
 	try {
-		res = parser.parse_rule_sequence(tagset_);
+		res = parser.parse_tag_rule_sequence(tagset_);
 	} catch (antlr::MismatchedTokenException &e) {
 		throw ParserException(
 				e.getFileLineColumnString() + " " + e.getMessage()
@@ -467,7 +467,7 @@ boost::shared_ptr<TagRule> Parser::parseSingleRule(
 }
 
 /**
- * @desc Parse a single rule. Runs parse_single_rule rule in the parser
+ * @desc Parse a single rule. Runs parse_single_tag_rule rule in the parser
  *       grammar.
  * @arg istr input stream with writed rule
  * @return the parsed rule via a shared pointer
@@ -480,7 +480,7 @@ boost::shared_ptr<TagRule> Parser::parseSingleRule(
 	boost::shared_ptr<TagRule> res;
 
 	try {
-		res = parser.parse_single_rule(tagset_);
+		res = parser.parse_single_tag_rule(tagset_);
 	} catch (antlr::MismatchedTokenException &e) {
 		throw ParserException(
 				e.getFileLineColumnString() + " " + e.getMessage()

libwccl/parser/grammar.g

@@ -257,24 +257,24 @@ parse_match_operator
 // ----------------------------------------------------------------------------
 // Rule for parsing single WCCL Rule
 // Returns boost::shared_ptr<TagRule>
-parse_single_rule
+parse_single_tag_rule
 	[const Corpus2::Tagset &tagset]
 	returns [boost::shared_ptr<TagRule> rle]
 {	
 	ParsingScope scope(tagset);
 }
-	: rle = rule [scope]
+	: rle = tag_rule [scope]
 ;
 
-// Rule for parsing rules section in the wccl file
+// Rule for parsing tag rule section in the wccl file
 // Returns boost::shared_ptr<TagRuleSequence>
-parse_rule_sequence
+parse_tag_rule_sequence
 	[const Corpus2::Tagset& tagset]
 	returns [boost::shared_ptr<TagRuleSequence> rule_seq]
 {
 	ParsingScope scope(tagset);
 }
-	: rule_seq = rules[scope]
+	: rule_seq = tag_rules[scope]
 ;
 
 // ----------------------------------------------------------------------------
@@ -303,7 +303,7 @@ parse_wccl_file
 }
 	: (any_operator_section [*wccl_file] )*
 	  (
-		rule_seq = parse_rule_sequence [tagset] { wccl_file->set_tag_rules(rule_seq); }
+		rule_seq = parse_tag_rule_sequence [tagset] { wccl_file->set_tag_rules(rule_seq); }
 		(any_operator_section [*wccl_file] )*
 	  )?
 	EOF
@@ -1977,7 +1977,7 @@ action_sequence
 // ----------------------------------------------------------------------------
 // Single rule:
 // 	rule(NAME, ACTIONS) or rule(NAME, COND, ACTIONS)
-rule
+tag_rule
 	[ParsingScope& scope]
 	returns [boost::shared_ptr<TagRule> rle]
 {
@@ -2022,7 +2022,7 @@ rule
 ;
 
 // Rule sequence
-rule_sequence
+tag_rule_sequence
 	[ParsingScope& scope]
 	returns [boost::shared_ptr<TagRuleSequence> rule_seq]
 {
@@ -2031,22 +2031,22 @@ rule_sequence
 
 	rule_seq.reset(new TagRuleSequence());
 }
-	: rle = rule [scope] {
+	: rle = tag_rule [scope] {
 		rule_seq->push_back(*rle);
 	}
 	(
-		COMMA rle = rule [scope] {
+		COMMA rle = tag_rule [scope] {
 			rule_seq->push_back(*rle);
 		}
 	)*
 ;
 
 // Temporary name. 
-// This is wrapper for rule_sequence in rules section in the wccl file
-rules
+// This is wrapper for tag_rule_sequence in rules section in the wccl file
+tag_rules
 	[ParsingScope& scope]
 	returns [boost::shared_ptr<TagRuleSequence> rule_seq]
-	: "rules" LPAREN rule_seq = rule_sequence [scope] RPAREN {
+	: "tag_rules" LPAREN rule_seq = tag_rule_sequence [scope] RPAREN {
 		//
 	}
 ;

tests/rules-data/tag/manyrules/prep-agr.ccl

-rules(
+tag_rules(
 	rule("prep-case", // prep [with-case]
 		and(
 			equal(class[-1], prep),

tests/rules-data/tag/relabel-enc/enc.ccl

-rules(
+tag_rules(
 	rule("enc_suger",
 		in({ger,subst}, class[0]),
 		relabel({ger}, equal(class[0], {subst}))

tests/rules-data/tag/select/sel_agr.ccl

-rules(
+tag_rules(
 	rule("sel-agr0",
 		and(
 			equal(class[0], subst),

tests/rules-data/tag/select/seln.ccl

-rules(
+tag_rules(
 	rule("sel-n",
 		select(
 			equal(gnd[0], {n})

tests/rules-data/tag/select/seln1.ccl

-rules(
+tag_rules(
 	rule("sel-n",
 		and(equal(base[0], "i")),
 		select(

tests/rules-data/tag/unify/agreed.ccl

-rules(
+tag_rules(
 	rule("unify3-case",
 		not(
 			equal(cas[0], {}),

tests/rules-data/tag/unify2/agr.ccl

-rules(
+tag_rules(
 	rule("agr3",
 		unify(0, 2, {nmb, gnd, cas})
 	)

tests/rules-data/tag/zero/rule.ccl

-rules(
+tag_rules(
 	rule("rule1",
 	in(class[0], {conj, qub}),
 	delete(