Commit bf5750fb authored by Jérôme Galtier's avatar Jérôme Galtier
Browse files

Enable FSXML IO for automata in TAF-Kit.

* taf-kit/src/edition_commands.hxx, taf-kit/src/getters.hh,
taf-kit/src/getters.hxx, taf-kit/src/library_commands.hh,
taf-kit/src/pipe_getters.hxx, taf-kit/src/pipe_writers.hxx: Remove the
comments around automaton_loader, automaton_saver and dot_dump.
parent 46436bac
2009-12-03 Jrme Galtier <jerome.galtier@lrde.epita.fr>
Enable FSXML IO for automata in TAF-Kit.
* taf-kit/src/edition_commands.hxx, taf-kit/src/getters.hh,
taf-kit/src/getters.hxx, taf-kit/src/library_commands.hh,
taf-kit/src/pipe_getters.hxx, taf-kit/src/pipe_writers.hxx: Remove the
comments around automaton_loader, automaton_saver and dot_dump.
2009-12-03 Jrme Galtier <jerome.galtier@lrde.epita.fr>
 
Cleanup the add_state operator.
......
......@@ -403,9 +403,7 @@ namespace edition_commands
CHOICE_COMMAND (7, set_unset_initial_final (a, set_to_be, final));
CHOICE_COMMAND (8, set_unset_initial_final (a, set_to_not_be, final));
/*
CHOICE_COMMAND (9, vcsn::tools::dot_display (a, "A", true));
*/
case 10: return true;
}
......
......@@ -32,9 +32,7 @@
# ifdef WITH_TWO_ALPHABETS
# include <vaucanson/xml/contexts/fmp.hh>
# endif
/*
# include <vaucanson/xml/XML.hh>
*/
# include <vaucanson/tools/io.hh>
# include <string>
......
......@@ -34,9 +34,7 @@
# ifdef WITH_TWO_ALPHABETS
# include <vaucanson/xml/contexts/fmp.hh>
# endif
/*
# include <vaucanson/xml/XML.hh>
*/
# include <vaucanson/tools/fsm_load.hh>
# include <string>
# include <cstdlib>
......@@ -244,9 +242,7 @@ static automaton_t get_aut (const arguments_t& args, int n)
if (not is->fail ())
{
using namespace vcsn::tools;
/*
using namespace vcsn::xml;
*/
# ifndef WITH_TWO_ALPHABETS
automaton_t a = make_automaton(alphabet_t());
......@@ -257,9 +253,7 @@ static automaton_t get_aut (const arguments_t& args, int n)
switch (global_result.input_aut_type)
{
case INPUT_TYPE_XML:
/*
*is >> automaton_loader(a, string_out (), XML ());
*/
break;
# ifndef WITH_TWO_ALPHABETS
case INPUT_TYPE_FSM:
......@@ -308,9 +302,7 @@ static IOAUT_CONTEXT::automaton_t get_boolean_aut(const arguments_t& args, const
if (not is->fail())
{
using namespace vcsn::tools;
/*
using namespace vcsn::xml;
*/
IOAUT_CONTEXT::automaton_t a =
IOAUT_CONTEXT::make_automaton(first_alphabet_t());
......@@ -318,9 +310,7 @@ static IOAUT_CONTEXT::automaton_t get_boolean_aut(const arguments_t& args, const
switch (global_result.input_aut_type)
{
case INPUT_TYPE_XML:
/*
*is >> automaton_loader(a, string_out (), XML ());
*/
break;
case INPUT_TYPE_FSM:
fsm_load(*is, a);
......
......@@ -33,17 +33,13 @@
# ifdef WITH_TWO_ALPHABETS
# include <vaucanson/xml/contexts/fmp.hh>
# endif
/*
# include <vaucanson/xml/XML.hh>
*/
using namespace CONTEXT_NAMESPACE;
using namespace vcsn;
using namespace vcsn::tools;
/*
using vcsn::xml::XML;
*/
# include <iostream>
# include <sys/types.h>
......
......@@ -54,9 +54,7 @@ automaton_getter::operator() (std::string& str) const
switch (f)
{
case INPUT_TYPE_XML:
/*
is >> automaton_loader(a, string_out (), XML ());
*/
break;
# ifndef WITH_TWO_ALPHABETS
case INPUT_TYPE_FSM:
......@@ -98,9 +96,7 @@ automaton_getter::operator() (command_output_status& i) const
switch (f)
{
case INPUT_TYPE_XML:
/*
std::cin >> automaton_loader(a, string_out (), XML ());
*/
break;
# ifndef WITH_TWO_ALPHABETS
case INPUT_TYPE_FSM:
......@@ -253,9 +249,7 @@ boolean_automaton_getter::operator() (std::string& str) const
switch (f)
{
case INPUT_TYPE_XML:
/*
is >> automaton_loader(a, string_out (), XML ());
*/
break;
case INPUT_TYPE_FSM:
fsm_load(is, a);
......@@ -285,9 +279,7 @@ boolean_automaton_getter::operator() (command_output_status& i) const
switch (f)
{
case INPUT_TYPE_XML:
/*
std::cin >> automaton_loader(a, string_out (), XML ());
*/
break;
case INPUT_TYPE_FSM:
fsm_load(std::cin, a);
......
......@@ -59,17 +59,13 @@ pipe_stream_writer::operator() (automaton_t& a) const
switch (aut_f)
{
case OUTPUT_TYPE_XML:
/*
o << automaton_saver (a, string_out (), XML ());
*/
break;
case OUTPUT_TYPE_FSM:
fsm_dump (o, a);
break;
case OUTPUT_TYPE_DOT:
/*
dot_dump (o, a, "");
*/
break;
default:
std::cerr << "Could not save automaton: unkown output type." << std::endl;
......@@ -83,9 +79,7 @@ pipe_stream_writer::operator() (rat_exp_t& a) const
switch (exp_f)
{
case OUTPUT_TYPE_XML:
/*
o << regexp_saver (a, string_out (), XML ());
*/
break;
case OUTPUT_TYPE_EXP:
o << a << std::endl;
......@@ -104,9 +98,7 @@ pipe_stream_writer::operator()
switch (aut_f)
{
case OUTPUT_TYPE_XML:
/*
o << automaton_saver (a, string_out (), XML ());
*/
break;
case OUTPUT_TYPE_FSM:
fsm_dump (o, a);
......@@ -128,9 +120,7 @@ pipe_stream_writer::operator()
switch (aut_f)
{
case OUTPUT_TYPE_XML:
/*
o << automaton_saver (a, string_out (), XML ());
*/
break;
case OUTPUT_TYPE_FSM:
fsm_dump (o, a);
......@@ -151,9 +141,7 @@ pipe_stream_writer::operator()
switch (aut_f)
{
case OUTPUT_TYPE_XML:
/*
o << automaton_saver (a, string_out (), XML ());
*/
break;
case OUTPUT_TYPE_FSM:
fsm_dump (o, a);
......@@ -175,9 +163,7 @@ pipe_stream_writer::operator()
switch (aut_f)
{
case OUTPUT_TYPE_XML:
/*
o << automaton_saver (a, string_out (), XML ());
*/
break;
case OUTPUT_TYPE_FSM:
fsm_dump (o, a);
......@@ -200,9 +186,7 @@ pipe_stream_writer::operator()
switch (aut_f)
{
case OUTPUT_TYPE_XML:
/*
o << automaton_saver (a, string_out (), XML ());
*/
break;
case OUTPUT_TYPE_FSM:
fsm_dump (o, a);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment