From 9bf7a05adaf8c98d116d90bdf88c311ce45ad6c4 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Thu, 25 Nov 2010 17:55:08 +0100
Subject: [PATCH] expose Parser's tagset object
---
libwccl/parser/Parser.cpp | 15 +++++++--------
libwccl/parser/Parser.h | 7 ++++++-
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/libwccl/parser/Parser.cpp b/libwccl/parser/Parser.cpp
index c314933..66ddfab 100644
--- a/libwccl/parser/Parser.cpp
+++ b/libwccl/parser/Parser.cpp
@@ -5,7 +5,7 @@
/**
* @desc Parser constructor. Default tagset is NULL
*/
-Parser::Parser(const Corpus2::Tagset& t) : tagset(t)
+Parser::Parser(const Corpus2::Tagset& t) : tagset_(t)
{
}
@@ -45,7 +45,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
ANTLRLexer lexer(istr);
ANTLRParser parser(lexer);
- return parser.parse_string_operator(this->tagset);
+ return parser.parse_string_operator(tagset_);
}
// ----------------------------------------------------------------------------
@@ -75,7 +75,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
ANTLRLexer lexer(istr);
ANTLRParser parser(lexer);
- return parser.parse_predicates(this->tagset);
+ return parser.parse_predicates(tagset_);
}
// ----------------------------------------------------------------------------
@@ -105,8 +105,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
{
ANTLRLexer lexer(istr);
ANTLRParser parser(lexer);
-
- return parser.parse_sym_set_operator(this->tagset);
+ return parser.parse_sym_set_operator(tagset_);
}
// ----------------------------------------------------------------------------
@@ -141,7 +140,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
ANTLRLexer lexer(istr);
ANTLRParser parser(lexer);
try {
- result = parser.parse_sym_set_operator(this->tagset);
+ result = parser.parse_sym_set_operator(tagset_);
} catch (antlr::ANTLRException) {
// ignore, try another type
}
@@ -152,7 +151,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
ANTLRLexer lexer(istr);
ANTLRParser parser(lexer);
try {
- result = parser.parse_string_operator(this->tagset);
+ result = parser.parse_string_operator(tagset_);
} catch (antlr::ANTLRException) {
// ignore, try another type
}
@@ -163,7 +162,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
ANTLRLexer lexer(istr);
ANTLRParser parser(lexer);
try {
- result = parser.parse_predicates(this->tagset);
+ result = parser.parse_predicates(tagset_);
} catch (antlr::ANTLRException) {
throw;
}
diff --git a/libwccl/parser/Parser.h b/libwccl/parser/Parser.h
index 872adec..58ef082 100644
--- a/libwccl/parser/Parser.h
+++ b/libwccl/parser/Parser.h
@@ -51,8 +51,13 @@ public:
parseAnyOperator(const std::string&) const;
boost::shared_ptr<ANTLRParserResultBase>
parseAnyOperator(std::istream&) const;
+
+ const Corpus2::Tagset& tagset() const {
+ return tagset_;
+ }
+
private:
- const Corpus2::Tagset &tagset;
+ const Corpus2::Tagset &tagset_;
};
#endif // LIBWCCL_PARSER_PARSER_H
--
GitLab