From 788648dfbfa64624158cdc16a19defd5b860fa95 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Thu, 9 Dec 2010 17:42:51 +0100
Subject: [PATCH] use a.none()/a.any() instead of a == 0/ a != 0 for bitsets
---
libcorpus2/tag.cpp | 2 +-
libcorpus2/tag.h | 2 +-
libcorpus2/tagset.cpp | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libcorpus2/tag.cpp b/libcorpus2/tag.cpp
index 9cbdaf3..bb08d81 100644
--- a/libcorpus2/tag.cpp
+++ b/libcorpus2/tag.cpp
@@ -36,7 +36,7 @@ int Tag::pos_count() const
int Tag::get_pos_index() const
{
- if (pos_ == 0) return -1;
+ if (pos_.none()) return -1;
return PwrNlp::lowest_bit(pos_);
}
diff --git a/libcorpus2/tag.h b/libcorpus2/tag.h
index 324c88e..41297e0 100644
--- a/libcorpus2/tag.h
+++ b/libcorpus2/tag.h
@@ -68,7 +68,7 @@ public:
}
bool is_null() const {
- return pos_ == 0 && values_ == 0;
+ return pos_.none() && values_.none();
}
int pos_count() const;
diff --git a/libcorpus2/tagset.cpp b/libcorpus2/tagset.cpp
index 475bf10..00f31f4 100644
--- a/libcorpus2/tagset.cpp
+++ b/libcorpus2/tagset.cpp
@@ -252,9 +252,9 @@ Tag Tagset::parse_simple_tag(const string_range_vector &ts,
for (size_t i = 1; i < ts.size(); ++i) {
if (!ts[i].empty()) {
mask_t val = get_value_mask(boost::copy_range<std::string>(ts[i]));
- if (val == 0) {
+ if (val.none()) {
mask_t a = get_attribute_mask(ts[i]);
- if (a != 0) {
+ if (a.any()) {
values &= (~a);
} else {
throw TagParseError("Unknown attribute value",
@@ -335,7 +335,7 @@ bool Tagset::validate_tag(const Tag &t, bool allow_extra,
for (idx_t i = 0; i < attribute_count(); ++i) {
mask_t value = t.get_values_for(get_attribute_mask(i));
- if (value == 0) {
+ if (value.none()) {
if (required[i]) {
if (os) {
(*os) << " red attribuite "
--
GitLab