diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b8678df3bacb8dfafa0bd77a4c4ff9406ad3568..fee6e6c11994d0f82b9af916ed84f648470690bd 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 123bf257549ba0e2b2e72c4f9805feb62af305f5..3d13e4c98f652304073483e6f166209a351872a4 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 0efff88380c3d4c4bccd0398a682f0d8a5d1e799..522b2d39e806439d2ac37d5c3a96abe3ffefdabd 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 bde2a6227c20ee9e78ef984287c8878378ba4e11..5eac8ae9d29225382c8f4255d0a44995caf3425c 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 f44149f2b50fc690c83792c0e5aa34711f659d80..cc7acea256f22e1c39ba7e47f1e746fe85b8dd5f 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;