From b1472affaf5fd3194327a51ad05bb97b977f5623 Mon Sep 17 00:00:00 2001
From: Adam Radziszewski <eliasz@nietbuk.(none)>
Date: Wed, 7 Sep 2011 22:28:10 +0200
Subject: [PATCH] fix bug with masking POS under non-64-bit boxes
---
CMakeLists.txt | 2 +-
libwccl/CMakeLists.txt | 2 +-
libwccl/ops/functions/tset/getwordclass.h | 2 +-
libwccl/parser/grammar.g | 2 +-
tests/getsymbols.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b8678d..fee6e6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.0)
set(ver_major "0")
set(ver_minor "0")
-set(ver_patch "3")
+set(ver_patch "4")
# use some of our own Find* scripts
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeScripts)
diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt
index 123bf25..3d13e4c 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.9 REQUIRED)
+find_package(Corpus2 1.0.11 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 0efff88..522b2d3 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(-1), pos_expr)
+ : GetSymbols(Corpus2::Tag(Corpus2::filled_mask), pos_expr)
{
}
diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index bde2a62..5eac8ae 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(-1), p1, p2));
+ ret.reset(new GetSymbolsInRange(Corpus2::Tag(Corpus2::filled_mask), p1, p2));
}
else {
ret.reset(new GetSymbolsInRange(tset->get_value(), p1, p2));
diff --git a/tests/getsymbols.cpp b/tests/getsymbols.cpp
index f44149f..cc7acea 100644
--- a/tests/getsymbols.cpp
+++ b/tests/getsymbols.cpp
@@ -44,7 +44,7 @@ struct SymbolsFix : public Wccl::PositionFixture
gnd = tagset.parse_symbol("gnd");
nmb = tagset.parse_symbol("nmb");
vcl = tagset.parse_symbol("vcl");
- tag_pos.set_pos(-1); //todo
+ tag_pos.set_pos(Corpus2::filled_mask);
}
boost::shared_ptr<Corpus2::Sentence> s;
--
GitLab