From d57f5f11eb635d4913e9ed1958cc3066d145dd44 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Thu, 14 Apr 2011 15:50:02 +0200
Subject: [PATCH] Fix issues with previous commit
---
libcorpus2/io/cclreader.cpp | 2 +-
libcorpus2/io/cclreader.h | 2 +-
libcorpus2/io/fastxces.cpp | 2 +-
libcorpus2/io/fastxces.h | 2 +-
libcorpus2/io/reader.cpp | 2 +-
libcorpus2/io/reader.h | 18 +++++++++++++++++-
libcorpus2/io/rft.cpp | 2 +-
libcorpus2/io/rft.h | 2 +-
libcorpus2/io/xcesreader.cpp | 2 +-
libcorpus2/io/xcesreader.h | 2 +-
10 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/libcorpus2/io/cclreader.cpp b/libcorpus2/io/cclreader.cpp
index 14d2b99..eadd580 100644
--- a/libcorpus2/io/cclreader.cpp
+++ b/libcorpus2/io/cclreader.cpp
@@ -220,7 +220,7 @@ void CclReader::set_option(const std::string& option)
}
}
-std::string CclReader::get_option(const std::string& option)
+std::string CclReader::get_option(const std::string& option) const
{
if (option == "disamb_only") {
return impl_->get_disamb_only() ? option : "";
diff --git a/libcorpus2/io/cclreader.h b/libcorpus2/io/cclreader.h
index 8909c4d..067957b 100644
--- a/libcorpus2/io/cclreader.h
+++ b/libcorpus2/io/cclreader.h
@@ -44,7 +44,7 @@ public:
void set_option(const std::string& option);
- std::string get_option(const std::string& option);
+ std::string get_option(const std::string& option) const;
static bool registered;
diff --git a/libcorpus2/io/fastxces.cpp b/libcorpus2/io/fastxces.cpp
index 0d52af9..25d4a8c 100644
--- a/libcorpus2/io/fastxces.cpp
+++ b/libcorpus2/io/fastxces.cpp
@@ -164,7 +164,7 @@ void FastXcesReader::set_option(const std::string& /*option*/)
{
}
-std::string FastXcesReader::get_option(const std::string& option)
+std::string FastXcesReader::get_option(const std::string& option) const
{
return BufferedChunkReader::get_option(option);
}
diff --git a/libcorpus2/io/fastxces.h b/libcorpus2/io/fastxces.h
index 876bdad..365ad09 100644
--- a/libcorpus2/io/fastxces.h
+++ b/libcorpus2/io/fastxces.h
@@ -26,7 +26,7 @@ public:
void set_option(const std::string& option);
- std::string get_option(const std::string& option);
+ std::string get_option(const std::string& option) const;
static bool registered;
diff --git a/libcorpus2/io/reader.cpp b/libcorpus2/io/reader.cpp
index 837b78a..0c75d9a 100644
--- a/libcorpus2/io/reader.cpp
+++ b/libcorpus2/io/reader.cpp
@@ -46,7 +46,7 @@ void TokenReader::set_option(const std::string &option)
}
}
-std::string TokenReader::get_option(const std::string &option)
+std::string TokenReader::get_option(const std::string &option) const
{
if (option == "ign") {
return tag_parse_mode_ & Tagset::ParseFailWithIgn ? option : "";
diff --git a/libcorpus2/io/reader.h b/libcorpus2/io/reader.h
index ee4dc27..b0b3a8b 100644
--- a/libcorpus2/io/reader.h
+++ b/libcorpus2/io/reader.h
@@ -97,7 +97,7 @@ public:
* Option inspector. Should echo the option if it is set, return
* an empty string otheriwse, and "unknown" if the option is invalid.
*/
- virtual std::string get_option(const std::string& option);
+ virtual std::string get_option(const std::string& option) const;
/**
* Tagset accesor
@@ -291,6 +291,14 @@ public:
boost::shared_ptr<Chunk> get_next_chunk();
+ void set_option(const std::string& option) {
+ TokenReader::set_option(option);
+ }
+
+ std::string get_option(const std::string& option) const {
+ return TokenReader::get_option(option);
+ }
+
protected:
virtual void ensure_more() = 0;
@@ -320,6 +328,14 @@ public:
boost::shared_ptr<Chunk> get_next_chunk();
+ void set_option(const std::string& option) {
+ TokenReader::set_option(option);
+ }
+
+ std::string get_option(const std::string& option) const {
+ return TokenReader::get_option(option);
+ }
+
protected:
virtual Sentence::Ptr actual_next_sentence() = 0;
diff --git a/libcorpus2/io/rft.cpp b/libcorpus2/io/rft.cpp
index 5918b11..26ae24f 100644
--- a/libcorpus2/io/rft.cpp
+++ b/libcorpus2/io/rft.cpp
@@ -152,7 +152,7 @@ void RftReader::set_option(const std::string &option)
}
}
-std::string RftReader::get_option(const std::string &option)
+std::string RftReader::get_option(const std::string &option) const
{
if (option == "mbt") {
return mbt_dialect_ ? option : "";
diff --git a/libcorpus2/io/rft.h b/libcorpus2/io/rft.h
index 7ae19a2..ba8c429 100644
--- a/libcorpus2/io/rft.h
+++ b/libcorpus2/io/rft.h
@@ -68,7 +68,7 @@ public:
void set_option(const std::string& option);
- std::string get_option(const std::string& option);
+ std::string get_option(const std::string& option) const;
static bool registered;
diff --git a/libcorpus2/io/xcesreader.cpp b/libcorpus2/io/xcesreader.cpp
index 9378fcd..bf14d9d 100644
--- a/libcorpus2/io/xcesreader.cpp
+++ b/libcorpus2/io/xcesreader.cpp
@@ -105,7 +105,7 @@ void XcesReader::set_option(const std::string& option)
}
}
-std::string XcesReader::get_option(const std::string& option)
+std::string XcesReader::get_option(const std::string& option) const
{
if (option == "sh") {
return impl_->get_disamb_sh() ? option : "";
diff --git a/libcorpus2/io/xcesreader.h b/libcorpus2/io/xcesreader.h
index 56c11f1..f1a2253 100644
--- a/libcorpus2/io/xcesreader.h
+++ b/libcorpus2/io/xcesreader.h
@@ -44,7 +44,7 @@ public:
void set_option(const std::string& option);
- std::string get_option(const std::string& option);
+ std::string get_option(const std::string& option) const;
static bool registered;
--
GitLab