This is my suggestion for naming rules (based on the issue concerning

'unify the names of the rules').

libwccl/parser/Parser.cpp

@@ -47,7 +47,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
 	ANTLRLexer lexer(istr);
 	ANTLRParser parser(lexer);
 
-	return parser.parse_string_operator(tagset_);
+	return parser.parse_strset_operator(tagset_);
 }
 
 // ----------------------------------------------------------------------------
@@ -77,7 +77,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
 	ANTLRLexer lexer(istr);
 	ANTLRParser parser(lexer);
 
-	return parser.parse_predicates(tagset_);
+	return parser.parse_bool_operator(tagset_);
 }
 
 // ----------------------------------------------------------------------------
@@ -107,7 +107,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
 {
 	ANTLRLexer lexer(istr);
 	ANTLRParser parser(lexer);
-	return parser.parse_sym_set_operator(tagset_);
+	return parser.parse_symset_operator(tagset_);
 }
 
 // ----------------------------------------------------------------------------
@@ -176,7 +176,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
 		ANTLRLexer lexer(ss);
 		ANTLRParser parser(lexer);
 		try {
-			result = parser.parse_sym_set_operator(tagset_);
+			result = parser.parse_position_operator(tagset_);
 		} catch (antlr::ANTLRException& e) {
 			errors << "(as tset) " << e.getMessage() << "\n";
 			// ignore, try another type
@@ -188,7 +188,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
 		ANTLRLexer lexer(ss);
 		ANTLRParser parser(lexer);
 		try {
-			result = parser.parse_string_operator(tagset_);
+			result = parser.parse_strset_operator(tagset_);
 		} catch (antlr::ANTLRException& e) {
 			errors << "(as strset) " << e.getMessage() << "\n";
 			// ignore, try another type
@@ -200,7 +200,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
 		ANTLRLexer lexer(ss);
 		ANTLRParser parser(lexer);
 		try {
-			result = parser.parse_predicates(tagset_);
+			result = parser.parse_bool_operator(tagset_);
 		} catch (antlr::ANTLRException& e) {
 			errors << "(as predicate) " << e.getMessage() << "\n";
 			// ignore, try another type