1 files changed, 7 insertions, 5 deletions
diff --git a/valexpr.h b/valexpr.h
index 81b20495..d6d590bc 100644
--- a/valexpr.h
+++ b/valexpr.h
@@ -52,7 +52,8 @@ struct value_expr_t
     TODAY,
     CLEARED,
     REAL,
-    INDEX,			// for accounts, this is the DEPTH
+    INDEX,
+    DEPTH,
 
     // Item totals
     BALANCE,
@@ -60,6 +61,10 @@ struct value_expr_t
     TOTAL,
     COST_TOTAL,
 
+    // Relating to format_t
+    VALUE_EXPR,
+    TOTAL_EXPR,
+
     // Functions
     F_ARITH_MEAN,
     F_VALUE,
@@ -68,6 +73,7 @@ struct value_expr_t
     F_STRIP,
     F_PAYEE_MASK,
     F_ACCOUNT_MASK,
+    F_SHORT_ACCOUNT_MASK,
 
     // Binary operators
     O_ADD,
@@ -174,10 +180,6 @@ class item_predicate
   }
 };
 
-std::string regexps_to_predicate(std::list<std::string>::const_iterator begin,
-				 std::list<std::string>::const_iterator end,
-				 const bool account_regexp = true);
-
 } // namespace report
 
 #endif // _REPORT_H