From bff3a72f8247670a9e02437a0a3d065a4c85f262 Mon Sep 17 00:00:00 2001
From: Adam Radziszewski <adam.radziszewski@pwr.wroc.pl>
Date: Fri, 29 Apr 2011 11:33:16 +0200
Subject: [PATCH] change rule -> tag_rule in syntax, make parser rule names
explicit about this
---
libwccl/parser/Parser.cpp | 8 +++----
libwccl/parser/grammar.g | 26 ++++++++++-----------
tests/rules-data/tag/manyrules/prep-agr.ccl | 2 +-
tests/rules-data/tag/relabel-enc/enc.ccl | 2 +-
tests/rules-data/tag/select/sel_agr.ccl | 2 +-
tests/rules-data/tag/select/seln.ccl | 2 +-
tests/rules-data/tag/select/seln1.ccl | 2 +-
tests/rules-data/tag/unify/agreed.ccl | 2 +-
tests/rules-data/tag/unify2/agr.ccl | 2 +-
tests/rules-data/tag/zero/rule.ccl | 2 +-
10 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/libwccl/parser/Parser.cpp b/libwccl/parser/Parser.cpp
index 54813ed..0e9643c 100644
--- a/libwccl/parser/Parser.cpp
+++ b/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()
diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index 39b47dc..246dd17 100644
--- a/libwccl/parser/grammar.g
+++ b/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 {
//
}
;
diff --git a/tests/rules-data/tag/manyrules/prep-agr.ccl b/tests/rules-data/tag/manyrules/prep-agr.ccl
index a3d7f9c..7dbd6f3 100644
--- a/tests/rules-data/tag/manyrules/prep-agr.ccl
+++ b/tests/rules-data/tag/manyrules/prep-agr.ccl
@@ -1,4 +1,4 @@
-rules(
+tag_rules(
rule("prep-case", // prep [with-case]
and(
equal(class[-1], prep),
diff --git a/tests/rules-data/tag/relabel-enc/enc.ccl b/tests/rules-data/tag/relabel-enc/enc.ccl
index 6868730..65f6cdd 100644
--- a/tests/rules-data/tag/relabel-enc/enc.ccl
+++ b/tests/rules-data/tag/relabel-enc/enc.ccl
@@ -1,4 +1,4 @@
-rules(
+tag_rules(
rule("enc_suger",
in({ger,subst}, class[0]),
relabel({ger}, equal(class[0], {subst}))
diff --git a/tests/rules-data/tag/select/sel_agr.ccl b/tests/rules-data/tag/select/sel_agr.ccl
index 6f8fc99..99174ac 100644
--- a/tests/rules-data/tag/select/sel_agr.ccl
+++ b/tests/rules-data/tag/select/sel_agr.ccl
@@ -1,4 +1,4 @@
-rules(
+tag_rules(
rule("sel-agr0",
and(
equal(class[0], subst),
diff --git a/tests/rules-data/tag/select/seln.ccl b/tests/rules-data/tag/select/seln.ccl
index 8cafdf8..2440653 100644
--- a/tests/rules-data/tag/select/seln.ccl
+++ b/tests/rules-data/tag/select/seln.ccl
@@ -1,4 +1,4 @@
-rules(
+tag_rules(
rule("sel-n",
select(
equal(gnd[0], {n})
diff --git a/tests/rules-data/tag/select/seln1.ccl b/tests/rules-data/tag/select/seln1.ccl
index e8ccbf9..e1a5bf4 100644
--- a/tests/rules-data/tag/select/seln1.ccl
+++ b/tests/rules-data/tag/select/seln1.ccl
@@ -1,4 +1,4 @@
-rules(
+tag_rules(
rule("sel-n",
and(equal(base[0], "i")),
select(
diff --git a/tests/rules-data/tag/unify/agreed.ccl b/tests/rules-data/tag/unify/agreed.ccl
index 77fb3e4..f52aaf3 100644
--- a/tests/rules-data/tag/unify/agreed.ccl
+++ b/tests/rules-data/tag/unify/agreed.ccl
@@ -1,4 +1,4 @@
-rules(
+tag_rules(
rule("unify3-case",
not(
equal(cas[0], {}),
diff --git a/tests/rules-data/tag/unify2/agr.ccl b/tests/rules-data/tag/unify2/agr.ccl
index d0eb115..d23f84b 100644
--- a/tests/rules-data/tag/unify2/agr.ccl
+++ b/tests/rules-data/tag/unify2/agr.ccl
@@ -1,4 +1,4 @@
-rules(
+tag_rules(
rule("agr3",
unify(0, 2, {nmb, gnd, cas})
)
diff --git a/tests/rules-data/tag/zero/rule.ccl b/tests/rules-data/tag/zero/rule.ccl
index d9689ad..1c009c1 100644
--- a/tests/rules-data/tag/zero/rule.ccl
+++ b/tests/rules-data/tag/zero/rule.ccl
@@ -1,4 +1,4 @@
-rules(
+tag_rules(
rule("rule1",
in(class[0], {conj, qub}),
delete(
--
GitLab