Make the helper functions in CompoundCondition static

[poefilter.git] / source / condition.h

diff --git a/source/condition.h b/source/condition.h
index 979f1e904714032788a8daf1d850568c713f353e..af8aa95faa282c364c515111eb93e33dad6c061e 100644 (file)
--- a/source/condition.h
+++ b/source/condition.h
@@ -20,7 +20,8 @@ public:
        virtual Condition *clone() const = 0;
        virtual Condition *flatten() const { return clone(); }
        virtual bool can_merge(const Condition &, const CompoundCondition &) const { return false; }
-       virtual Condition *merge(const std::vector<Condition *> &, const CompoundCondition &) const { return 0; }
+       virtual Condition *merge(const std::vector<const Condition *> &, const CompoundCondition &) const { return 0; }
+       virtual bool is_viable() const { return true; }
        virtual void add_lines(std::list<FilterStatement> &) const = 0;
 };
 
@@ -42,14 +43,14 @@ protected:
 public:
        void add(Condition *);
        unsigned count() const { return conditions.size(); }
-       const Condition *get(unsigned) const;
+       const Condition &get(unsigned) const;
 
        virtual Condition *flatten() const;
 protected:
        Condition *dispatch_flatten(Condition *, Condition *) const;
-       Condition *merge_two(Condition *, Condition *, bool) const;
-       Condition *add_merged_to(Condition *, CompoundCondition *, bool) const;
-       Condition *merge_contents_to(CompoundCondition *, CompoundCondition *) const;
+       static Condition *merge_two(Condition *, Condition *, const CompoundCondition &, bool);
+       static Condition *add_merged_to(Condition *, CompoundCondition *, bool);
+       static Condition *merge_contents_to(CompoundCondition *, CompoundCondition *);
        virtual Condition *flatten(Condition *, Condition *) const = 0;
        virtual Condition *flatten(AndCondition *, Condition *) const = 0;
        virtual Condition *flatten(AndCondition *, AndCondition *) const = 0;
@@ -71,6 +72,7 @@ protected:
        virtual Condition *flatten(OrCondition *, AndCondition *) const;
        virtual Condition *flatten(OrCondition *, OrCondition *) const;
 public:
+       virtual bool is_viable() const;
        virtual void add_lines(std::list<FilterStatement> &) const;
 };
 
@@ -87,6 +89,7 @@ protected:
        virtual Condition *flatten(OrCondition *, AndCondition *) const;
        virtual Condition *flatten(OrCondition *, OrCondition *) const;
 public:
+       virtual bool is_viable() const;
        virtual void add_lines(std::list<FilterStatement> &) const;
 };