Moved xact_xdata_t into xact_t itself, as a set of "extended data" that might

be gathered during reporting.

Removed the references to accounts and such from the mask logic, which means
that the value expression "acount =~ /foo/" is needed in place of just
"/foo/".

1 files changed, 3 insertions, 3 deletions

diff --git a/token.h b/token.h
index 73833a2a..04ca39c1 100644
--- a/token.h
+++ b/token.h
@@ -36,7 +36,7 @@
 
 namespace ledger {
 
-struct expr_t::token_t : public noncopyable, public supports_flags<>
+struct expr_t::token_t : public noncopyable
 {
   enum kind_t {
     VALUE,			// any kind of literal value
@@ -79,7 +79,7 @@ struct expr_t::token_t : public noncopyable, public supports_flags<>
   value_t     value;
   std::size_t length;
 
-  explicit token_t() : supports_flags<>(), kind(UNKNOWN), length(0) {
+  explicit token_t() : kind(UNKNOWN), length(0) {
     TRACE_CTOR(token_t, "");
   }
   ~token_t() throw() {
@@ -104,7 +104,7 @@ struct expr_t::token_t : public noncopyable, public supports_flags<>
   }
 
   void parse_ident(std::istream& in);
-  void next(std::istream& in, unsigned int flags);
+  void next(std::istream& in, const uint_least8_t flags);
   void rewind(std::istream& in);
   void unexpected();