* src/ltlast/multop.cc (multop::multop): Use multop::add.

(multop::add): If the formulae we add is itself a multop for the
same operator, merge its children with ours.
* src/ltltest/parseerr.test: Add two tests for multop merging.

ChangeLog

@@ -1,3 +1,10 @@
+2003-04-16  Alexandre DURET-LUTZ  <aduret@circe.lip6.fr>
+
+	* src/ltlast/multop.cc (multop::multop): Use multop::add.
+	(multop::add): If the formulae we add is itself a multop for the 
+	same operator, merge its children with ours.
+	* src/ltltest/parseerr.test: Add two tests for multop merging.
+
 2003-04-15  Alexandre DURET-LUTZ  <aduret@src.lip6.fr>
 
 	* src/ltlast/formulae.hh (formulae::equals): Remove.

src/ltlast/multop.cc

@@ -8,16 +8,31 @@ namespace spot
   namespace ltl
   {    
     multop::multop(type op, formulae* first, formulae* second)
-      : op_(op), children_(2)
+      : op_(op)
     {
-      children_[0] = first;
+      children_.reserve(2);
-      children_[1] = second;
+      add(first);
+      add(second);
     }
     
     void
     multop::add(formulae* f)
     {
-      children_.push_back(f);
+      // If the formulae we add is itself a multop for the same operator,
+      // merge its children with ours.
+      multop* p = dynamic_cast<multop*>(f);
+      if (p && p->op() == op())
+	{
+	  unsigned ps = p->size();
+	  for (unsigned i = 0; i < ps; ++i)
+	    children_.push_back(p->nth(i));
+	  // that sub-formulae is now useless 
+	  delete f;
+	}
+      else
+	{
+	  children_.push_back(f);
+	}
     }
 
     multop::~multop()

src/ltltest/parseerr.test

@@ -39,6 +39,9 @@ check 'a U b V c R' ''
 # leading and trailing garbage are skipped
 check '/2/3/4/5 a + b /6/7/8/' 'multop(Or, AP(a), AP(b))'
 check 'a U b c' 'binop(U, AP(a), AP(b))'
+# (check multop merging while we are at it)
+check 'a & b & c & d e' 'multop(And, AP(a), AP(b), AP(c), AP(d))'
+check 'a & (b | c) & d should work' 'multop(And, AP(a), multop(Or, AP(b), AP(c)), AP(d))'
 
 # Recovery inside parentheses
 check 'a U (b c) U e R (f g <=> h)' \