From dfc82ee3f0fcf0a0ea940d574931f9f1ebb2e2a8 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 15 Apr 2003 11:48:36 +0000 Subject: [PATCH] * src/ltlast/formulae.hh (formulae::equals): Remove. * src/ltlast/unop.hh (unop::equals): Remove. * src/ltlast/unop.cc (unop::equals): Remove. * src/ltlast/binop.hh (binop::equals): Remove. * src/ltlast/binop.cc (binop::equals): Remove. * src/ltlast/multop.hh (multop::equals): Remove. * src/ltlast/multop.cc (multop::equals): Remove. * src/ltlast/atomic_prop.hh (atomic_prop::equals): Remove. * src/ltlast/atomic_prop.cc (atomic_prop::equals): Remove. * src/ltlast/constant.hh (constant::equals): Remove. * src/ltlast/constant.cc (constant::equals): Remove. --- ChangeLog | 12 ++++++++++++ src/ltlast/atomic_prop.cc | 7 ------- src/ltlast/atomic_prop.hh | 2 -- src/ltlast/binop.cc | 9 --------- src/ltlast/binop.hh | 2 -- src/ltlast/constant.cc | 7 ------- src/ltlast/constant.hh | 2 -- src/ltlast/formulae.hh | 2 -- src/ltlast/multop.cc | 32 -------------------------------- src/ltlast/multop.hh | 2 -- src/ltlast/unop.cc | 7 ------- src/ltlast/unop.hh | 2 -- 12 files changed, 12 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ff0dad63..a1d5dee71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2003-04-15 Alexandre DURET-LUTZ + * src/ltlast/formulae.hh (formulae::equals): Remove. + * src/ltlast/unop.hh (unop::equals): Remove. + * src/ltlast/unop.cc (unop::equals): Remove. + * src/ltlast/binop.hh (binop::equals): Remove. + * src/ltlast/binop.cc (binop::equals): Remove. + * src/ltlast/multop.hh (multop::equals): Remove. + * src/ltlast/multop.cc (multop::equals): Remove. + * src/ltlast/atomic_prop.hh (atomic_prop::equals): Remove. + * src/ltlast/atomic_prop.cc (atomic_prop::equals): Remove. + * src/ltlast/constant.hh (constant::equals): Remove. + * src/ltlast/constant.cc (constant::equals): Remove. + * HACKING, Makefile.am, configure.ac, m4/gccwarn.m4, src/Makefile.am, src/ltlast/Makefile.am, src/ltlast/allnodes.hh, src/ltlast/atomic_prop.cc, src/ltlast/atomic_prop.hh, diff --git a/src/ltlast/atomic_prop.cc b/src/ltlast/atomic_prop.cc index 7ebd9d281..d381e29b2 100644 --- a/src/ltlast/atomic_prop.cc +++ b/src/ltlast/atomic_prop.cc @@ -27,13 +27,6 @@ namespace spot v.visit(this); } - bool - atomic_prop::equals(const formulae* f) const - { - const atomic_prop* p = dynamic_cast(f); - return p && p->name() == name(); - } - const std::string& atomic_prop::name() const { diff --git a/src/ltlast/atomic_prop.hh b/src/ltlast/atomic_prop.hh index fc915d4d3..35d607934 100644 --- a/src/ltlast/atomic_prop.hh +++ b/src/ltlast/atomic_prop.hh @@ -18,8 +18,6 @@ namespace spot virtual void accept(visitor& visitor); virtual void accept(const_visitor& visitor) const; - virtual bool equals(const formulae* f) const; - const std::string& name() const; private: std::string name_; diff --git a/src/ltlast/binop.cc b/src/ltlast/binop.cc index 993aaf816..d797f41d1 100644 --- a/src/ltlast/binop.cc +++ b/src/ltlast/binop.cc @@ -51,15 +51,6 @@ namespace spot return second_; } - bool - binop::equals(const formulae* f) const - { - const binop* p = dynamic_cast(f); - return p && p->op() == op() - && first()->equals(p->first()) - && second()->equals(p->second()); - } - binop::type binop::op() const { diff --git a/src/ltlast/binop.hh b/src/ltlast/binop.hh index c621c7155..b755e3f9a 100644 --- a/src/ltlast/binop.hh +++ b/src/ltlast/binop.hh @@ -21,8 +21,6 @@ namespace spot virtual void accept(visitor& v); virtual void accept(const_visitor& v) const; - virtual bool equals(const formulae* f) const; - const formulae* first() const; formulae* first(); const formulae* second() const; diff --git a/src/ltlast/constant.cc b/src/ltlast/constant.cc index 27c4927e3..d7e52792c 100644 --- a/src/ltlast/constant.cc +++ b/src/ltlast/constant.cc @@ -27,13 +27,6 @@ namespace spot v.visit(this); } - bool - constant::equals(const formulae* f) const - { - const constant* p = dynamic_cast(f); - return p && p->val() == val(); - } - constant::type constant::val() const { diff --git a/src/ltlast/constant.hh b/src/ltlast/constant.hh index 60c7cd010..5f8e2dc3f 100644 --- a/src/ltlast/constant.hh +++ b/src/ltlast/constant.hh @@ -19,8 +19,6 @@ namespace spot virtual void accept(visitor& v); virtual void accept(const_visitor& v) const; - virtual bool equals(const formulae* h) const; - const formulae* child() const; formulae* child(); diff --git a/src/ltlast/formulae.hh b/src/ltlast/formulae.hh index d329f6811..03378f8b4 100644 --- a/src/ltlast/formulae.hh +++ b/src/ltlast/formulae.hh @@ -13,8 +13,6 @@ namespace spot public: virtual void accept(visitor& v) = 0; virtual void accept(const_visitor& v) const = 0; - - virtual bool equals(const formulae* f) const = 0; }; } diff --git a/src/ltlast/multop.cc b/src/ltlast/multop.cc index 3f74646b6..b2cdbae7a 100644 --- a/src/ltlast/multop.cc +++ b/src/ltlast/multop.cc @@ -60,38 +60,6 @@ namespace spot return op_; } - bool - multop::equals(const formulae* f) const - { - // This check is a bit more complicated than other checks - // because And(a, b, c) is equal to And(c, a, b, a). - const multop* p1 = dynamic_cast(f); - if (!p1 || p1->op() != op()) - return false; - - const multop* p2 = this; - unsigned s1 = p1->size(); - unsigned s2 = p2->size(); - if (s1 > s2) - { - std::swap(s1, s2); - std::swap(p1, p2); - } - - for (unsigned n1 = 0; n1 < s1; ++n1) - { - unsigned n2; - for (n2 = 0; n2 < s2; ++n2) - { - if (p1->nth(n1)->equals(p2->nth(n2))) - break; - } - if (n2 == s2) - return false; - } - return true; - } - const char* multop::op_name() const { diff --git a/src/ltlast/multop.hh b/src/ltlast/multop.hh index 16409d46e..18cee2250 100644 --- a/src/ltlast/multop.hh +++ b/src/ltlast/multop.hh @@ -24,8 +24,6 @@ namespace spot virtual void accept(visitor& v); virtual void accept(const_visitor& v) const; - virtual bool equals(const formulae* f) const; - unsigned size() const; const formulae* nth(unsigned n) const; formulae* nth(unsigned n); diff --git a/src/ltlast/unop.cc b/src/ltlast/unop.cc index 975aecc75..02eb664f5 100644 --- a/src/ltlast/unop.cc +++ b/src/ltlast/unop.cc @@ -39,13 +39,6 @@ namespace spot return child_; } - bool - unop::equals(const formulae* f) const - { - const unop* p = dynamic_cast(f); - return p && p->op() == op() && child()->equals(p->child()); - } - unop::type unop::op() const { diff --git a/src/ltlast/unop.hh b/src/ltlast/unop.hh index cee1f4f89..38e28e745 100644 --- a/src/ltlast/unop.hh +++ b/src/ltlast/unop.hh @@ -19,8 +19,6 @@ namespace spot virtual void accept(visitor& v); virtual void accept(const_visitor& v) const; - virtual bool equals(const formulae* h) const; - const formulae* child() const; formulae* child();