Add support the bounded star operator [*i..j].

* src/ltlast/bunop.hh, src/ltlast/bunop.cc: New files for bounded unary operators. * src/ltlast/Makefile.am, src/ltlast/allnodes.hh: Add them. * src/ltlast/predecl.hh (bunop): Declare. * src/ltlast/unop.hh, src/ltlast/unop.cc (Star): Remove declaration of Star and associated code. * src/ltlast/visitor.hh: Add visit(bunop* node) methods. * src/ltlparse/ltlparse.yy, src/ltlparse/ltlscan.ll: Add parse rules for LTL. This required passing the parse_error list to the lexer, so it can report scanning errors when it reads a number that does not fit in an unsigned int. * src/ltlparse/parsedecl.hh (YY_DECL): Take error_list as third argument. * src/ltltest/consterm.test, src/ltltest/tostring.test, src/ltltest/equals.test, src/tgbatest/ltl2tgba.test: More tests. * src/ltlvisit/basicreduce.cc, src/ltlvisit/clone.cc, src/ltlvisit/clone.hh, src/ltlvisit/consterm.cc, src/ltlvisit/dotty.cc, src/ltlvisit/mark.cc, src/ltlvisit/nenoform.cc, src/ltlvisit/postfix.cc, src/ltlvisit/postfix.hh, src/ltlvisit/reduce.cc, src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc, src/ltlvisit/tunabbrev.cc, src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Adjust syntax to use "bunop::Star" instead of "unop::Star". * src/tgbaalgos/ltl2tgba_fm.cc: Likewise, but also adjust the code to handle the bounds of the operator.
2010-05-12 19:09:20 +02:00 · 2010-05-12 19:09:20 +02:00 · 126b724a98
commit 126b724a98
parent 47b2bea865
33 changed files with 678 additions and 115 deletions
--- a/src/ltlast/bunop.hh
+++ b/src/ltlast/bunop.hh
@ -0,0 +1,113 @@
+// Copyright (C) 2010 Laboratoire de Recherche et Développement
+// de l'Epita (LRDE).
+//
+// This file is part of Spot, a model checking library.
+//
+// Spot is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// Spot is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+// License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Spot; see the file COPYING.  If not, write to the Free
+// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+
+/// \file ltlast/bunop.hh
+/// \brief Bounded Unary operators
+#ifndef SPOT_LTLAST_BUNOP_HH
+# define SPOT_LTLAST_BUNOP_HH
+
+#include <map>
+#include <iosfwd>
+#include "refformula.hh"
+
+namespace spot
+{
+  namespace ltl
+  {
+
+    /// \brief Bounded unary operator.
+    /// \ingroup ltl_ast
+    class bunop : public ref_formula
+    {
+    public:
+      enum type { Star };
+
+      static const unsigned unbounded = -1U;
+
+      /// \brief Build a bunop with bounds \a min and \a max.
+      ///
+      /// The following trivial simplifications are performed
+      /// automatically (the left expression is rewritten as the right
+      /// expression):
+      ///   - 0[*0..max] = [*0]
+      ///   - 0[*min..max] = 0 if min > 0
+      ///   - [*0][*min..max] = [*0]
+      ///   - Exp[*i..j][*k..l] = Exp[*ik..jl] if i*(k+1)<=jk+1.
+      ///
+      /// These rewriting rules imply that it is not possible to build
+      /// an LTL formula object that is SYNTACTICALLY equal to one of
+      /// these left expressions.
+      static formula* instance(type op,
+			       formula* child,
+			       unsigned min = 0,
+			       unsigned max = unbounded);
+
+      virtual void accept(visitor& v);
+      virtual void accept(const_visitor& v) const;
+
+      /// Get the sole operand of this operator.
+      const formula* child() const;
+      /// Get the sole operand of this operator.
+      formula* child();
+
+      /// Minimum number of repetition.
+      unsigned min() const;
+      /// Minimum number of repetition.
+      unsigned max() const;
+
+      /// \brief A string representation of the operator.
+      ///
+      /// For instance "[*2..]".
+      std::string format() const;
+
+      /// Get the type of this operator.
+      type op() const;
+      /// Get the type of this operator, as a string.
+      const char* op_name() const;
+
+      /// Return a canonic representation of operation.
+      virtual std::string dump() const;
+
+      /// Number of instantiated unary operators.  For debugging.
+      static unsigned instance_count();
+
+      /// Dump all instances.  For debugging.
+      static std::ostream& dump_instances(std::ostream& os);
+
+    protected:
+      typedef std::pair<unsigned, unsigned> pairu;
+      typedef std::pair<type, formula*> pairo;
+      typedef std::pair<pairo, pairu> pair;
+      typedef std::map<pair, bunop*> map;
+      static map instances;
+
+      bunop(type op, formula* child, unsigned min, unsigned max);
+      virtual ~bunop();
+
+    private:
+      type op_;
+      formula* child_;
+      unsigned min_;
+      unsigned max_;
+    };
+
+  }
+}
+#endif // SPOT_LTLAST_BUNOP_HH