Use the spot::formater class in ltlcheck to format output commands.

* src/misc/formater.hh (printable_value): Add more accessors.
* src/bin/ltlcheck.cc: Use the formater class to factor the %-expansion
loop, and reuse filenames (such as %F, %S, and %L) between executions
on the same formula.

src/bin/ltlcheck.cc

@@ -44,6 +44,7 @@
 #include "tgbaalgos/randomgraph.hh"
 #include "tgbaalgos/scc.hh"
 #include "tgbaalgos/dotty.hh"
+#include "misc/formater.hh"
 
 const char argp_program_doc[] ="\
 Call several LTL/PSL translators and cross-compare their output to detect \
@@ -163,10 +164,10 @@ parse_opt(int key, char* arg, struct argp_state*)
 }
 
 static int
-create_tmpfile(unsigned int n, std::string& name)
+create_tmpfile(char c, unsigned int n, std::string& name)
 {
   char tmpname[30];
-  snprintf(tmpname, sizeof tmpname, "ltlcheck-%u-XXXXXX", n);
+  snprintf(tmpname, sizeof tmpname, "lck-%c%u-XXXXXX", c, n);
   int fd = mkstemp(tmpname);
   if (fd == -1)
     error(2, errno, "failed to create a temporary file");
@@ -174,113 +175,130 @@ create_tmpfile(unsigned int n, std::string& name)
   return fd;
 }
 
-static void
+namespace
-string_to_tmp(std::string str, unsigned n, std::string& tmpname)
 {
-  int fd = create_tmpfile(n, tmpname);
+  struct quoted_string: public spot::printable_value<std::string>
-  write(fd, str.c_str(), str.size());
+  {
-  close(fd);
+    using spot::printable_value<std::string>::operator=;
-}
 
-static void
+    void
-multiple_results(unsigned int n)
+    print(std::ostream& os, const char* pos) const
-{
+    {
-  error(2, 0, "you may have only one %%N or %%T specifier: %s",
+      os << '\'';
-	translators[n]);
+      this->spot::printable_value<std::string>::print(os, pos);
-}
+      os << '\'';
+    }
+  };
 
-static const spot::tgba*
+  struct printable_result_filename: public spot::printable_value<std::string>
-run_translator(const spot::ltl::formula* f, unsigned int translator_num, char l)
+  {
-{
+    unsigned translator_num;
-  std::ostringstream command;
-  std::list<std::string> toclean;
-  std::string result;
     enum output_format { None, Spin, Lbtt };
-  output_format out_format = None;
+    mutable output_format format;
 
-  const char* format = translators[translator_num];
+    void reset(unsigned n)
-  for (const char* pos = format; *pos; ++pos)
-    if (*pos != '%')
-      command << *pos;
-    else
-      switch (*++pos)
     {
-	case 'f':
+      val_.clear();
-	  command << '\'';
+      translator_num = n;
-	  spot::ltl::to_string(f, command, true);
+      format = None;
-	  command << '\'';
-	  break;
-	case 'F':
-	  {
-	    std::string tmpname;
-	    string_to_tmp(spot::ltl::to_string(f, true) + "\n",
-			  translator_num, tmpname);
-	    command << '\'' << tmpname << '\'';
-	    toclean.push_back(tmpname);
-	    break;
     }
-	case 'l':
+
-	  command << '\'';
+    void
-	  spot::ltl::to_lbt_string(f, command);
+    print(std::ostream& os, const char* pos) const
-	  command << '\'';
-	  break;
-	case 'L':
-	  {
-	    std::string tmpname;
-	    string_to_tmp(spot::ltl::to_lbt_string(f) + "\n",
-			  translator_num, tmpname);
-	    command << '\'' << tmpname << '\'';
-	    toclean.push_back(tmpname);
-	    break;
-	  }
-	case 'N':
-	case 'T':
     {
       if (*pos == 'N')
-	      out_format = Spin;
+	format = Spin;
       else
-	      out_format = Lbtt;
+	format = Lbtt;
-	    if (!result.empty())
+      if (!val_.empty())
-	      multiple_results(translator_num);
+	error(2, 0, "you may have only one %%N or %%T specifier: %s",
-	    close(create_tmpfile(translator_num, result));
+	      translators[translator_num]);
-	    command << '\'' << result << '\'';
+      close(create_tmpfile('o', translator_num,
-	    toclean.push_back(result);
+			   const_cast<std::string&>(val_)));
-	    break;
+      os << '\'' << val_ << '\'';
     }
-	case 's':
+  };
-	  command << '\'';
+
-	  spot::ltl::to_spin_string(f, command, true);
+  class translator_runner: protected spot::formater
-	  command << '\'';
-	  break;
-	case 'S':
   {
-	    std::string tmpname;
+  private:
-	    string_to_tmp(spot::ltl::to_spin_string(f, true) + "\n",
+    // Round-specific variables
-			  translator_num, tmpname);
+    quoted_string string_ltl_spot;
-	    command << '\'' << tmpname << '\'';
+    quoted_string string_ltl_spin;
+    quoted_string string_ltl_lbt;
+    quoted_string filename_ltl_spot;
+    quoted_string filename_ltl_spin;
+    quoted_string filename_ltl_lbt;
+    std::list<std::string> toclean;
+    // Run-specific variables
+    printable_result_filename output;
+  public:
+    translator_runner()
+    {
+      declare('f', &string_ltl_spot);
+      declare('s', &string_ltl_spin);
+      declare('l', &string_ltl_lbt);
+      declare('F', &filename_ltl_spot);
+      declare('S', &filename_ltl_spin);
+      declare('L', &filename_ltl_lbt);
+      declare('N', &output);
+      declare('T', &output);
+
+      size_t s = translators.size();
+      assert(s);
+      for (size_t n = 0; n < s; ++n)
+	prime(translators[n]);
+
+    }
+
+    // Cleanup temporary files.
+    void round_cleanup()
+    {
+      for (std::list<std::string>::const_iterator i = toclean.begin();
+	   i != toclean.end(); ++i)
+	unlink(i->c_str());
+      toclean.clear();
+    }
+
+    void
+    string_to_tmp(std::string& str, unsigned n, std::string& tmpname)
+    {
+      int fd = create_tmpfile('i', n, tmpname);
+      write(fd, str.c_str(), str.size());
+      write(fd, "\n", 1);
+      close(fd);
       toclean.push_back(tmpname);
-	    break;
-	  }
-	case 0:
-	  --pos;
-	  // fall through
-	case '%':
-	  command << '%';
-	  break;
-	default:
-	  command << '%' << *pos;
-	  break;
     }
 
-  if (out_format == None)
+    void round_formula(const spot::ltl::formula* f, unsigned serial)
-    error(2, 0, "no output specifier in: %s", format);
+    {
+      if (has('f') || has('F'))
+	string_ltl_spot = spot::ltl::to_string(f, true);
+      if (has('s') || has('S'))
+	string_ltl_spin = spot::ltl::to_spin_string(f, true);
+      if (has('l') || has('L'))
+	string_ltl_lbt = spot::ltl::to_lbt_string(f);
+      if (has('F'))
+	string_to_tmp(string_ltl_spot, serial, filename_ltl_spot);
+      if (has('S'))
+	string_to_tmp(string_ltl_spin, serial, filename_ltl_spin);
+      if (has('L'))
+	string_to_tmp(string_ltl_lbt, serial, filename_ltl_lbt);
+    }
 
+    const spot::tgba* translate(unsigned int translator_num, char l)
+    {
+      output.reset(translator_num);
+
+      std::ostringstream command;
+      format(command, translators[translator_num]);
+      toclean.push_back(output.val());
       std::string cmd = command.str();
-  std::cerr << "Running [" << l << translator_num << "]: " << cmd << std::endl;
+      std::cerr << "Running [" << l << translator_num << "]: "
+		<< cmd << std::endl;
       int es = system(cmd.c_str());
 
       const spot::tgba* res = 0;
-
       if (es)
 	{
 	  std::cerr << "Execution of: " << cmd << "\n"
@@ -289,63 +307,60 @@ run_translator(const spot::ltl::formula* f, unsigned int translator_num, char l)
 	}
       else
 	{
-      switch (out_format)
+	  switch (output.format)
 	    {
-	case Spin:
+	    case printable_result_filename::Spin:
 	      {
 		spot::neverclaim_parse_error_list pel;
-	    res = spot::neverclaim_parse(result, pel, &dict);
+		res = spot::neverclaim_parse(output, pel, &dict);
 		if (!pel.empty())
 		  {
 		    std::cerr << "Failed to parse the produced neverclaim.\n";
-		spot::format_neverclaim_parse_errors(std::cerr, result, pel);
+		    spot::format_neverclaim_parse_errors(std::cerr,
+							 output, pel);
 		    delete res;
 		    res = 0;
 		  }
 		break;
 	      }
-	case Lbtt:
+	    case printable_result_filename::Lbtt:
 	      {
 		std::string error;
-	    std::fstream f(result.c_str());
+		std::fstream f(output.val().c_str());
 		if (!f)
 		  {
-		std::cerr << "Cannot open " << result << std::endl;
+		    std::cerr << "Cannot open " << output.val() << std::endl;
 		  }
 		else
 		  {
-		res = spot::lbtt_parse(f, error, &dict);
+		    res = spot::lbtt_parse(f, output.val(), &dict);
 		if (!res)
 		  std::cerr << "Failed error to parse output in LBTT format: "
 			    << error << std::endl;
 		  }
 		break;
 	      }
-	case None:
+	    case printable_result_filename::None:
 	      assert(!"unreachable code");
 	    }
 	}
-
-  // Cleanup any temporary file.
-  for (std::list<std::string>::const_iterator i = toclean.begin();
-       i != toclean.end(); ++i)
-    unlink(i->c_str());
       return res;
-}
+    }
+  };
 
-static bool
+  static bool
-is_empty(const spot::tgba* aut)
+  is_empty(const spot::tgba* aut)
-{
+  {
     spot::emptiness_check* ec = spot::couvreur99(aut);
     spot::emptiness_check_result* res = ec->check();
     delete res;
     delete ec;
     return !res;
-}
+  }
 
-static void
+  static void
-cross_check(const std::vector<spot::scc_map*>& maps, char l)
+  cross_check(const std::vector<spot::scc_map*>& maps, char l)
-{
+  {
     size_t m = maps.size();
 
     std::vector<bool> res(m);
@@ -391,16 +406,16 @@ cross_check(const std::vector<spot::scc_map*>& maps, char l)
 	    }
 	std::cerr << "} when evaluating the state-space\n";
       }
-}
+  }
 
-typedef std::set<spot::state*, spot::state_ptr_less_than> state_set;
+  typedef std::set<spot::state*, spot::state_ptr_less_than> state_set;
 
-// Collect all the states of SSPACE that appear in the accepting SCCs
+  // Collect all the states of SSPACE that appear in the accepting SCCs
-// of PROD.
+  // of PROD.
-static void
+  static void
-states_in_acc(const spot::scc_map* m, const spot::tgba* sspace,
+  states_in_acc(const spot::scc_map* m, const spot::tgba* sspace,
 		state_set& s)
-{
+  {
     const spot::tgba* aut = m->get_aut();
     unsigned c = m->scc_count();
     for (unsigned n = 0; n < c; ++n)
@@ -415,12 +430,12 @@ states_in_acc(const spot::scc_map* m, const spot::tgba* sspace,
 		x->destroy();
 	    }
 	}
-}
+  }
 
-static bool
+  static bool
-consistency_check(const spot::scc_map* pos, const spot::scc_map* neg,
+  consistency_check(const spot::scc_map* pos, const spot::scc_map* neg,
 		    const spot::tgba* sspace)
-{
+  {
     // the states of SSPACE should appear in the accepting SCC of at
     // least one of POS or NEG.  Maybe both.
     state_set s;
@@ -431,13 +446,12 @@ consistency_check(const spot::scc_map* pos, const spot::scc_map* neg,
     for (it = s.begin(); it != s.end(); it++)
       (*it)->destroy();
     return res;
-}
+  }
 
-
-namespace
-{
   class processor: public job_processor
   {
+    translator_runner runner;
+
   public:
     int
     process_formula(const spot::ltl::formula* f,
@@ -445,6 +459,7 @@ namespace
     {
       (void) filename;
       (void) linenum;
+      static unsigned round = 0;
 
       if (filename)
 	std::cerr << filename << ":";
@@ -460,13 +475,18 @@ namespace
       std::vector<const spot::tgba*> pos(m);
       std::vector<const spot::tgba*> neg(m);
 
+      runner.round_formula(f, round);
+      for (size_t n = 0; n < m; ++n)
+	pos[n] = runner.translate(n, 'P');
+
       const spot::ltl::formula* nf =
 	spot::ltl::unop::instance(spot::ltl::unop::Not, f->clone());
+      runner.round_formula(nf, round);
       for (size_t n = 0; n < m; ++n)
-	{
+	neg[n] = runner.translate(n, 'N');
-	  pos[n] = run_translator(f, n, 'P');
+
-	  neg[n] = run_translator(nf, n, 'N');
+      ++round;
-	}
+      runner.round_cleanup();
 
       spot::ltl::atomic_prop_set* ap = spot::ltl::atomic_prop_collect(f);
 

src/misc/formater.hh

@@ -45,11 +45,26 @@ namespace spot
   protected:
     T val_;
   public:
-    operator T() const
+    const T& val() const
     {
       return val_;
     }
 
+    T& val()
+    {
+      return val_;
+    }
+
+    operator const T&() const
+    {
+      return val();
+    }
+
+    operator T&()
+    {
+      return val();
+    }
+
     printable_value&
     operator=(const T& new_val)
     {