From 51680974f1feaea84c7fb7ed2a027b131817b02d Mon Sep 17 00:00:00 2001
From: Adam Radziszewski <adam.radziszewski@pwr.wroc.pl>
Date: Thu, 8 Sep 2011 10:17:31 +0200
Subject: [PATCH] use corpus2::Tag::all_pos_mask instead of low-level routines
---
libwccl/CMakeLists.txt | 2 +-
libwccl/ops/functions/tset/getwordclass.h | 2 +-
libwccl/parser/grammar.g | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt
index 3d13e4c..7c77e0a 100644
--- a/libwccl/CMakeLists.txt
+++ b/libwccl/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(wccl)
include_directories( ${CMAKE_CURRENT_BINARY_DIR}/include/ )
-find_package(Corpus2 1.0.11 REQUIRED)
+find_package(Corpus2 1.0.12 REQUIRED)
set(LIBS ${LIBS} ${Corpus2_LIBRARIES})
find_package(PwrUtils 1.0.1 REQUIRED)
diff --git a/libwccl/ops/functions/tset/getwordclass.h b/libwccl/ops/functions/tset/getwordclass.h
index 522b2d3..a350562 100644
--- a/libwccl/ops/functions/tset/getwordclass.h
+++ b/libwccl/ops/functions/tset/getwordclass.h
@@ -14,7 +14,7 @@ public:
typedef boost::shared_ptr<Function<Position> > PosFunctionPtr;
GetWordClass(const PosFunctionPtr& pos_expr)
- : GetSymbols(Corpus2::Tag(Corpus2::filled_mask), pos_expr)
+ : GetSymbols(Corpus2::Tag::all_pos_mask, pos_expr)
{
}
diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index 5eac8ae..5d6e6db 100644
--- a/libwccl/parser/grammar.g
+++ b/libwccl/parser/grammar.g
@@ -859,7 +859,7 @@ symset_range
p2 = position_operator [scope]
RPAREN {
if (tag_class) {
- ret.reset(new GetSymbolsInRange(Corpus2::Tag(Corpus2::filled_mask), p1, p2));
+ ret.reset(new GetSymbolsInRange(Corpus2::Tag::all_pos_mask, p1, p2));
}
else {
ret.reset(new GetSymbolsInRange(tset->get_value(), p1, p2));
--
GitLab