sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added validation code for mask_t objects.

Browse source
This commit is contained in:
John Wiegley 2009-02-12 03:06:15 -04:00
parent eaac95147c
commit dc68903bb2
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mask.cc
View file

@ -42,6 +42,7 @@ mask_t::mask_t(const string& pat) : expr()
mask_t& mask_t::operator=(const string& pat) mask_t& mask_t::operator=(const string& pat)
{ {
expr.assign(pat.c_str(), regex::perl | regex::icase); expr.assign(pat.c_str(), regex::perl | regex::icase);
VERIFY(valid());
return *this; return *this;
} }

11
src/mask.h
View file

@ -77,12 +77,23 @@ public:
} }
bool match(const string& str) const { bool match(const string& str) const {
DEBUG("mask.match",
"Matching: \"" << str << "\" =~ /" << expr.str() << "/ = "
<< (boost::regex_search(str, expr) ? "true" : "false"));
return boost::regex_search(str, expr); return boost::regex_search(str, expr);
} }
bool empty() const { bool empty() const {
return expr.empty(); return expr.empty();
} }
bool valid() const {
if (expr.status() != 0) {
DEBUG("ledger.validate", "mask_t: expr.status() != 0");
return false;
}
return true;
}
}; };
inline std::ostream& operator<<(std::ostream& out, const mask_t& mask) { inline std::ostream& operator<<(std::ostream& out, const mask_t& mask) {

2
src/value.h
View file

@ -622,10 +622,12 @@ public:
mask_t& as_mask_lval() { mask_t& as_mask_lval() {
assert(is_mask()); assert(is_mask());
_dup(); _dup();
VERIFY(boost::get<mask_t>(storage->data).valid());
return boost::get<mask_t>(storage->data); return boost::get<mask_t>(storage->data);
} }
const mask_t& as_mask() const { const mask_t& as_mask() const {
assert(is_mask()); assert(is_mask());
VERIFY(boost::get<mask_t>(storage->data).valid());
return boost::get<mask_t>(storage->data); return boost::get<mask_t>(storage->data);
} }
void set_mask(const string& val) { void set_mask(const string& val) {