Updated OpenFST version to openfst-1.3.2-CL32004048 from Greco3.

Change-Id: I19b0db718256b35c0e3e5a7315f1ed6335e6dcac

35 files changed, 71 insertions, 66 deletions

diff --git a/src/bin/fstarcsort.cc b/src/bin/fstarcsort.cc
index 33e534d..9f1b420 100644
--- a/src/bin/fstarcsort.cc
+++ b/src/bin/fstarcsort.cc
@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
 
   if (argc > 3) {
     ShowUsage();
diff --git a/src/bin/fstclosure.cc b/src/bin/fstclosure.cc
index 569c708..f6b3324 100644
--- a/src/bin/fstclosure.cc
+++ b/src/bin/fstclosure.cc
@@ -34,7 +34,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstcompile.cc b/src/bin/fstcompile.cc
index db62f95..2e0bdd4 100644
--- a/src/bin/fstcompile.cc
+++ b/src/bin/fstcompile.cc
@@ -45,14 +45,14 @@ int main(int argc, char **argv) {
   usage += " [text.fst [binary.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
   }
 
   const char *source = "standard input";
-  istream *istrm = &std::cin;
+  istream *istrm = &cin;
   if (argc > 1 && strcmp(argv[1], "-") != 0) {
     source = argv[1];
     istrm = new fst::ifstream(argv[1]);
@@ -63,13 +63,16 @@ int main(int argc, char **argv) {
   }
   const SymbolTable *isyms = 0, *osyms = 0, *ssyms = 0;
 
+  fst::SymbolTableTextOptions opts;
+  opts.allow_negative = FLAGS_allow_negative_labels;
+
   if (!FLAGS_isymbols.empty()) {
-    isyms = SymbolTable::ReadText(FLAGS_isymbols, FLAGS_allow_negative_labels);
+    isyms = SymbolTable::ReadText(FLAGS_isymbols, opts);
     if (!isyms) exit(1);
   }
 
   if (!FLAGS_osymbols.empty()) {
-    osyms = SymbolTable::ReadText(FLAGS_osymbols, FLAGS_allow_negative_labels);
+    osyms = SymbolTable::ReadText(FLAGS_osymbols, opts);
     if (!osyms) exit(1);
   }
 
@@ -85,7 +88,7 @@ int main(int argc, char **argv) {
                 FLAGS_acceptor, FLAGS_keep_isymbols, FLAGS_keep_osymbols,
                 FLAGS_keep_state_numbering, FLAGS_allow_negative_labels);
 
-  if (istrm != &std::cin)
+  if (istrm != &cin)
     delete istrm;
 
   return 0;
diff --git a/src/bin/fstcompose.cc b/src/bin/fstcompose.cc
index 0ba8c47..996aca7 100644
--- a/src/bin/fstcompose.cc
+++ b/src/bin/fstcompose.cc
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
   usage += " in1.fst in2.fst [out.fst]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc < 3 || argc > 4) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstconcat.cc b/src/bin/fstconcat.cc
index fbe9b68..4a02205 100644
--- a/src/bin/fstconcat.cc
+++ b/src/bin/fstconcat.cc
@@ -34,7 +34,7 @@ int main(int argc, char **argv) {
   usage += " in1.fst in2.fst [out.fst]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc < 3 || argc > 4) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstconnect.cc b/src/bin/fstconnect.cc
index f774767..2900d1b 100644
--- a/src/bin/fstconnect.cc
+++ b/src/bin/fstconnect.cc
@@ -33,7 +33,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstconvert.cc b/src/bin/fstconvert.cc
index f7c4ad9..9fbb43e 100644
--- a/src/bin/fstconvert.cc
+++ b/src/bin/fstconvert.cc
@@ -33,7 +33,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstdeterminize.cc b/src/bin/fstdeterminize.cc
index aa5064f..ca7840e 100644
--- a/src/bin/fstdeterminize.cc
+++ b/src/bin/fstdeterminize.cc
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstdifference.cc b/src/bin/fstdifference.cc
index 5459b03..8bdf89e 100644
--- a/src/bin/fstdifference.cc
+++ b/src/bin/fstdifference.cc
@@ -39,7 +39,7 @@ int main(int argc, char **argv) {
   usage += " in1.fst in2.fst [out.fst]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc < 3 || argc > 4) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstdraw.cc b/src/bin/fstdraw.cc
index 51ebb2d..98f8ff4 100644
--- a/src/bin/fstdraw.cc
+++ b/src/bin/fstdraw.cc
@@ -26,8 +26,6 @@ DEFINE_string(isymbols, "", "Input label symbol table");
 DEFINE_string(osymbols, "", "Output label symbol table");
 DEFINE_string(ssymbols, "", "State label symbol table");
 DEFINE_bool(numeric, false, "Print numeric labels");
-DEFINE_string(save_isymbols, "", "Save input symbol table to file");
-DEFINE_string(save_osymbols, "", "Save output symbol table to file");
 DEFINE_int32(precision, 5, "Set precision (number of char/float)");
 DEFINE_bool(show_weight_one, false,
             "Print/draw arc weights and final weights equal to Weight::One()");
@@ -51,10 +49,10 @@ int main(int argc, char **argv) {
 
   string usage = "Prints out binary FSTs in dot text format.\n\n  Usage: ";
   usage += argv[0];
-  usage += " [binary.fst [text.fst]]\n";
+  usage += " [binary.fst [text.dot]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
@@ -65,7 +63,7 @@ int main(int argc, char **argv) {
   s::FstClass *fst = s::FstClass::Read(in_name);
   if (!fst) return 1;
 
-  ostream *ostrm = &std::cout;
+  ostream *ostrm = &cout;
   string dest = "stdout";
   if (argc == 3) {
     dest = argv[2];
@@ -79,13 +77,16 @@ int main(int argc, char **argv) {
 
   const SymbolTable *isyms = 0, *osyms = 0, *ssyms = 0;
 
+  fst::SymbolTableTextOptions opts;
+  opts.allow_negative = FLAGS_allow_negative_labels;
+
   if (!FLAGS_isymbols.empty() && !FLAGS_numeric) {
-    isyms = SymbolTable::ReadText(FLAGS_isymbols, FLAGS_allow_negative_labels);
+    isyms = SymbolTable::ReadText(FLAGS_isymbols, opts);
     if (!isyms) exit(1);
   }
 
   if (!FLAGS_osymbols.empty() && !FLAGS_numeric) {
-    osyms = SymbolTable::ReadText(FLAGS_osymbols, FLAGS_allow_negative_labels);
+    osyms = SymbolTable::ReadText(FLAGS_osymbols, opts);
     if (!osyms) exit(1);
   }
 
@@ -106,13 +107,7 @@ int main(int argc, char **argv) {
              FLAGS_fontsize, FLAGS_precision,
              FLAGS_show_weight_one, ostrm, dest);
 
-  if (isyms && !FLAGS_save_isymbols.empty())
-    isyms->WriteText(FLAGS_save_isymbols);
-
-  if (osyms && !FLAGS_save_osymbols.empty())
-    osyms->WriteText(FLAGS_save_osymbols);
-
-  if (ostrm != &std::cout)
+  if (ostrm != &cout)
     delete ostrm;
   return 0;
 }
diff --git a/src/bin/fstencode.cc b/src/bin/fstencode.cc
index 95dd49c..003ca24 100644
--- a/src/bin/fstencode.cc
+++ b/src/bin/fstencode.cc
@@ -39,7 +39,7 @@ int main(int argc, char **argv) {
   usage += " in.fst codex [out.fst]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc < 3 || argc > 4) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstepsnormalize.cc b/src/bin/fstepsnormalize.cc
index c8813c6..d5c1a8d 100644
--- a/src/bin/fstepsnormalize.cc
+++ b/src/bin/fstepsnormalize.cc
@@ -35,7 +35,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstequal.cc b/src/bin/fstequal.cc
index 885b330..c64f6e3 100644
--- a/src/bin/fstequal.cc
+++ b/src/bin/fstequal.cc
@@ -33,7 +33,7 @@ int main(int argc, char **argv) {
   usage += " in1.fst in2.fst\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc != 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstequivalent.cc b/src/bin/fstequivalent.cc
index e7e09f2..70010d7 100644
--- a/src/bin/fstequivalent.cc
+++ b/src/bin/fstequivalent.cc
@@ -43,7 +43,7 @@ int main(int argc, char **argv) {
   usage += " in1.fst in2.fst\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc != 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstinfo.cc b/src/bin/fstinfo.cc
index 23816be..f02e0b3 100644
--- a/src/bin/fstinfo.cc
+++ b/src/bin/fstinfo.cc
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 2) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstintersect.cc b/src/bin/fstintersect.cc
index b3558fc..3bdc26b 100644
--- a/src/bin/fstintersect.cc
+++ b/src/bin/fstintersect.cc
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
   usage += "  Flags: connect\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc < 3 || argc > 4) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstinvert.cc b/src/bin/fstinvert.cc
index f9b348b..00dadc5 100644
--- a/src/bin/fstinvert.cc
+++ b/src/bin/fstinvert.cc
@@ -32,7 +32,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstmap.cc b/src/bin/fstmap.cc
index 231c725..81336b1 100644
--- a/src/bin/fstmap.cc
+++ b/src/bin/fstmap.cc
@@ -43,7 +43,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstminimize.cc b/src/bin/fstminimize.cc
index 8d9d635..2d4e7a9 100644
--- a/src/bin/fstminimize.cc
+++ b/src/bin/fstminimize.cc
@@ -36,7 +36,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out1.fst [out2.fst]]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 4) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstprint.cc b/src/bin/fstprint.cc
index b42bb7e..b5b23e5 100644
--- a/src/bin/fstprint.cc
+++ b/src/bin/fstprint.cc
@@ -44,7 +44,7 @@ int main(int argc, char **argv) {
   usage += " [binary.fst [text.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
@@ -56,7 +56,7 @@ int main(int argc, char **argv) {
   s::FstClass *fst = s::FstClass::Read(in_name);
   if (!fst) return 1;
 
-  ostream *ostrm = &std::cout;
+  ostream *ostrm = &cout;
   string dest = "standard output";
   if (argc == 3) {
     dest = argv[2];
@@ -70,13 +70,16 @@ int main(int argc, char **argv) {
 
   const SymbolTable *isyms = 0, *osyms = 0, *ssyms = 0;
 
+  fst::SymbolTableTextOptions opts;
+  opts.allow_negative = FLAGS_allow_negative_labels;
+
   if (!FLAGS_isymbols.empty() && !FLAGS_numeric) {
-    isyms = SymbolTable::ReadText(FLAGS_isymbols, FLAGS_allow_negative_labels);
+    isyms = SymbolTable::ReadText(FLAGS_isymbols, opts);
     if (!isyms) exit(1);
   }
 
   if (!FLAGS_osymbols.empty() && !FLAGS_numeric) {
-    osyms = SymbolTable::ReadText(FLAGS_osymbols, FLAGS_allow_negative_labels);
+    osyms = SymbolTable::ReadText(FLAGS_osymbols, opts);
     if (!osyms) exit(1);
   }
 
@@ -99,7 +102,7 @@ int main(int argc, char **argv) {
   if (osyms && !FLAGS_save_osymbols.empty())
     osyms->WriteText(FLAGS_save_osymbols);
 
-  if (ostrm != &std::cout)
+  if (ostrm != &cout)
     delete ostrm;
   return 0;
 }
diff --git a/src/bin/fstproject.cc b/src/bin/fstproject.cc
index a67f431..efd8dbf 100644
--- a/src/bin/fstproject.cc
+++ b/src/bin/fstproject.cc
@@ -35,7 +35,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstprune.cc b/src/bin/fstprune.cc
index 2041b7c..dedf237 100644
--- a/src/bin/fstprune.cc
+++ b/src/bin/fstprune.cc
@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstpush.cc b/src/bin/fstpush.cc
index 3b849b5..d40ff9f 100644
--- a/src/bin/fstpush.cc
+++ b/src/bin/fstpush.cc
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstrandgen.cc b/src/bin/fstrandgen.cc
index f48d0cf..b3716e5 100644
--- a/src/bin/fstrandgen.cc
+++ b/src/bin/fstrandgen.cc
@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstrelabel.cc b/src/bin/fstrelabel.cc
index cc86450..e75db99 100644
--- a/src/bin/fstrelabel.cc
+++ b/src/bin/fstrelabel.cc
@@ -43,6 +43,7 @@ DEFINE_bool(allow_negative_labels, false,
 int main(int argc, char **argv) {
   namespace s = fst::script;
   using fst::SymbolTable;
+  using fst::SymbolTableTextOptions;
   using fst::script::FstClass;
   using fst::script::MutableFstClass;
 
@@ -58,7 +59,7 @@ int main(int argc, char **argv) {
   usage += "  -relabel_opairs   opairs.txts\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
@@ -71,24 +72,24 @@ int main(int argc, char **argv) {
   if (!fst) return 1;
 
   // Relabel with symbol tables
+  SymbolTableTextOptions opts;
+  opts.allow_negative = FLAGS_allow_negative_labels;
   if (!FLAGS_relabel_isymbols.empty() || !FLAGS_relabel_osymbols.empty()) {
     bool attach_new_isymbols = (fst->InputSymbols() != 0);
     const SymbolTable* old_isymbols = FLAGS_isymbols.empty()
         ? fst->InputSymbols()
-        : SymbolTable::ReadText(FLAGS_isymbols, FLAGS_allow_negative_labels);
+        : SymbolTable::ReadText(FLAGS_isymbols, opts);
     const SymbolTable* relabel_isymbols = FLAGS_relabel_isymbols.empty()
         ? NULL
-        : SymbolTable::ReadText(FLAGS_relabel_isymbols,
-                                FLAGS_allow_negative_labels);
+        : SymbolTable::ReadText(FLAGS_relabel_isymbols, opts);
 
     bool attach_new_osymbols = (fst->OutputSymbols() != 0);
     const SymbolTable* old_osymbols = FLAGS_osymbols.empty()
         ? fst->OutputSymbols()
-        : SymbolTable::ReadText(FLAGS_osymbols, FLAGS_allow_negative_labels);
+        : SymbolTable::ReadText(FLAGS_osymbols, opts);
     const SymbolTable* relabel_osymbols = FLAGS_relabel_osymbols.empty()
         ? NULL
-        : SymbolTable::ReadText(FLAGS_relabel_osymbols,
-                                FLAGS_allow_negative_labels);
+        : SymbolTable::ReadText(FLAGS_relabel_osymbols, opts);
 
     s::Relabel(fst,
                old_isymbols, relabel_isymbols, attach_new_isymbols,
diff --git a/src/bin/fstreplace.cc b/src/bin/fstreplace.cc
index 5d1d770..d6522fc 100644
--- a/src/bin/fstreplace.cc
+++ b/src/bin/fstreplace.cc
@@ -31,7 +31,7 @@ int main(int argc, char **argv) {
   usage += " root.fst rootlabel [rule1.fst label1 ...] [out.fst]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc < 4) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstreverse.cc b/src/bin/fstreverse.cc
index 7507ffa..a919f58 100644
--- a/src/bin/fstreverse.cc
+++ b/src/bin/fstreverse.cc
@@ -26,6 +26,7 @@
 #include <fst/script/fst-class.h>
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 int main(int argc, char **argv) {
   using fst::script::FstClass;
@@ -37,7 +38,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstreweight.cc b/src/bin/fstreweight.cc
index 3913a6d..4e8333d 100644
--- a/src/bin/fstreweight.cc
+++ b/src/bin/fstreweight.cc
@@ -35,7 +35,7 @@ int main(int argc, char **argv) {
   usage += " in.fst potential.txt [out.fst]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc < 3 || argc > 4) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstrmepsilon.cc b/src/bin/fstrmepsilon.cc
index 63a80b8..da4e6d9 100644
--- a/src/bin/fstrmepsilon.cc
+++ b/src/bin/fstrmepsilon.cc
@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstshortestdistance.cc b/src/bin/fstshortestdistance.cc
index 01f5617..9103b72 100644
--- a/src/bin/fstshortestdistance.cc
+++ b/src/bin/fstshortestdistance.cc
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [distance.txt]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstshortestpath.cc b/src/bin/fstshortestpath.cc
index 4a9e720..6e33db8 100644
--- a/src/bin/fstshortestpath.cc
+++ b/src/bin/fstshortestpath.cc
@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
 
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstsymbols.cc b/src/bin/fstsymbols.cc
index c07f1be..23a6447 100644
--- a/src/bin/fstsymbols.cc
+++ b/src/bin/fstsymbols.cc
@@ -48,7 +48,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
@@ -78,17 +78,18 @@ int main(int argc, char **argv) {
     }
   }
 
+  fst::SymbolTableTextOptions opts;
+  opts.allow_negative = FLAGS_allow_negative_labels;
+
   if (FLAGS_clear_isymbols)
     fst->SetInputSymbols(0);
   else if (!FLAGS_isymbols.empty())
-    fst->SetInputSymbols(
-        SymbolTable::ReadText(FLAGS_isymbols, FLAGS_allow_negative_labels));
+    fst->SetInputSymbols(SymbolTable::ReadText(FLAGS_isymbols, opts));
 
   if (FLAGS_clear_osymbols)
     fst->SetOutputSymbols(0);
   else if (!FLAGS_osymbols.empty())
-    fst->SetOutputSymbols(
-        SymbolTable::ReadText(FLAGS_osymbols, FLAGS_allow_negative_labels));
+    fst->SetOutputSymbols(SymbolTable::ReadText(FLAGS_osymbols, opts));
 
   if (!FLAGS_relabel_ipairs.empty()) {
     typedef int64 Label;
diff --git a/src/bin/fstsynchronize.cc b/src/bin/fstsynchronize.cc
index 7137504..8c226ad 100644
--- a/src/bin/fstsynchronize.cc
+++ b/src/bin/fstsynchronize.cc
@@ -32,7 +32,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fsttopsort.cc b/src/bin/fsttopsort.cc
index 6f04215..69896c7 100644
--- a/src/bin/fsttopsort.cc
+++ b/src/bin/fsttopsort.cc
@@ -32,7 +32,7 @@ int main(int argc, char **argv) {
   usage += " [in.fst [out.fst]]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc > 3) {
     ShowUsage();
     return 1;
diff --git a/src/bin/fstunion.cc b/src/bin/fstunion.cc
index 41c4f83..ae7eb66 100644
--- a/src/bin/fstunion.cc
+++ b/src/bin/fstunion.cc
@@ -25,6 +25,7 @@
 #include <fst/script/union.h>
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 int main(int argc, char **argv) {
   using fst::script::FstClass;
@@ -36,7 +37,7 @@ int main(int argc, char **argv) {
   usage += " in1.fst in2.fst [out.fst]\n";
 
   std::set_new_handler(FailedNewHandler);
-  SetFlags(usage.c_str(), &argc, &argv, true);
+  SET_FLAGS(usage.c_str(), &argc, &argv, true);
   if (argc < 3 || argc > 4) {
     ShowUsage();
     return 1;