factor regex package name matches into newly created cachefilter classes

[apt.git] / apt-pkg / contrib / error.h

diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index fc7b38f1b92f7ca8c7296e5c3eff630fb7688503..e5517c2da784d1153877871fc6bf04b8f1a87bbc 100644 (file)
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -206,7 +206,8 @@ public:                                                                     /*{{{*/
         *  \param[out] out output stream to write the messages in
         *  \param WithoutNotice output notices or not
         */
-       void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING);
+       void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING,
+                       bool const &mergeStack = true);
 
        /** \brief dumps the list of messages to std::cerr
         *
@@ -219,6 +220,28 @@ public:                                                                    /*{{{*/
                DumpErrors(std::cerr, trashhold);
        }
 
+       /** \brief put the current Messages into the stack
+        *
+        *  All "old" messages will be pushed into a stack to
+        *  them later back, but for now the Message query will be
+        *  empty and performs as no messages were present before.
+        *
+        * The stack can be as deep as you want - all stack operations
+        * will only operate on the last element in the stack.
+        */
+       void PushToStack();
+
+       /** \brief throw away all current messages */
+       void RevertToStack();
+
+       /** \brief merge current and stack together */
+       void MergeWithStack();
+
+       /** \brief return the deep of the stack */
+       size_t StackCount() const {
+               return Stacks.size();
+       }
+
        GlobalError();
                                                                        /*}}}*/
 private:                                                               /*{{{*/
@@ -244,10 +267,20 @@ private:                                                          /*{{{*/
        std::list<Item> Messages;
        bool PendingFlag;
 
+       struct MsgStack {
+               std::list<Item> const Messages;
+               bool const PendingFlag;
+
+               MsgStack(std::list<Item> const &Messages, bool const &Pending) :
+                        Messages(Messages), PendingFlag(Pending) {};
+       };
+
+       std::list<MsgStack> Stacks;
+
        bool InsertErrno(MsgType type, const char* Function,
-                        const char* Description, va_list const &args);
+                        const char* Description, va_list &args);
        bool Insert(MsgType type, const char* Description,
-                        va_list const &args);
+                        va_list &args);
                                                                        /*}}}*/
 };
                                                                        /*}}}*/