From 5b6dc79427b8f7eeb6a7ff68034ab8548ce670ea Mon Sep 17 00:00:00 2001
From: Alexander Gutkin <agutkin@google.com>
Date: Thu, 28 Feb 2013 00:24:20 +0000
Subject: Bumped OpenFST implementation to openfst-1.3.3-CL41851770.

Updated OpenFST implementation to the most recent version
used by Greco3 (corresponds to nlp::fst exported at Perforce
CL 41851770).

In particular this version has an improved PDT support.

Change-Id: I5aadfc962297eef73922c67e7d57866f11ee7d81
---
 src/include/fst/script/map.h | 54 +++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

(limited to 'src/include/fst/script/map.h')

diff --git a/src/include/fst/script/map.h b/src/include/fst/script/map.h
index 2332074..3caaa9f 100644
--- a/src/include/fst/script/map.h
+++ b/src/include/fst/script/map.h
@@ -59,46 +59,54 @@ void Map(MapArgs *args) {
   float delta =  args->args.arg3;
   typename Arc::Weight w = *(args->args.arg4.GetWeight<typename Arc::Weight>());
 
+  Fst<Arc> *fst = NULL;
+  Fst<LogArc> *lfst = NULL;
+  Fst<Log64Arc> *l64fst = NULL;
+  Fst<StdArc> *sfst = NULL;
   if (map_type == ARC_SUM_MAPPER) {
-    args->retval = new FstClass(
-        script::StateMap(ifst, ArcSumMapper<Arc>(ifst)));
+    args->retval = new FstClass(*(fst =
+        script::StateMap(ifst, ArcSumMapper<Arc>(ifst))));
   } else if (map_type == IDENTITY_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, IdentityArcMapper<Arc>()));
+    args->retval = new FstClass(*(fst =
+        script::ArcMap(ifst, IdentityArcMapper<Arc>())));
   } else if (map_type == INVERT_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, InvertWeightMapper<Arc>()));
+    args->retval = new FstClass(*(fst =
+        script::ArcMap(ifst, InvertWeightMapper<Arc>())));
   } else if (map_type == PLUS_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, PlusMapper<Arc>(w)));
+    args->retval = new FstClass(*(fst =
+        script::ArcMap(ifst, PlusMapper<Arc>(w))));
   } else if (map_type == QUANTIZE_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, QuantizeMapper<Arc>(delta)));
+    args->retval = new FstClass(*(fst =
+        script::ArcMap(ifst, QuantizeMapper<Arc>(delta))));
   } else if (map_type == RMWEIGHT_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, RmWeightMapper<Arc>()));
+    args->retval = new FstClass(*(fst =
+        script::ArcMap(ifst, RmWeightMapper<Arc>())));
   } else if (map_type == SUPERFINAL_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, SuperFinalMapper<Arc>()));
+    args->retval = new FstClass(*(fst =
+        script::ArcMap(ifst, SuperFinalMapper<Arc>())));
   } else if (map_type == TIMES_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, TimesMapper<Arc>(w)));
+    args->retval = new FstClass(*(fst =
+        script::ArcMap(ifst, TimesMapper<Arc>(w))));
   } else if (map_type == TO_LOG_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, WeightConvertMapper<Arc, LogArc>()));
+    args->retval = new FstClass(*(lfst =
+        script::ArcMap(ifst, WeightConvertMapper<Arc, LogArc>())));
   } else if (map_type == TO_LOG64_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, WeightConvertMapper<Arc, Log64Arc>()));
+    args->retval = new FstClass(*(l64fst =
+        script::ArcMap(ifst, WeightConvertMapper<Arc, Log64Arc>())));
   } else if (map_type == TO_STD_MAPPER) {
-    args->retval = new FstClass(
-        script::ArcMap(ifst, WeightConvertMapper<Arc, StdArc>()));
+    args->retval = new FstClass(*(sfst =
+        script::ArcMap(ifst, WeightConvertMapper<Arc, StdArc>())));
   } else {
     FSTERROR() << "Error: unknown/unsupported mapper type: "
                << map_type;
     VectorFst<Arc> *ofst = new VectorFst<Arc>;
     ofst->SetProperties(kError, kError);
-    args->retval = new FstClass(ofst);
+    args->retval = new FstClass(*(fst =ofst));
   }
+  delete sfst;
+  delete l64fst;
+  delete lfst;
+  delete fst;
 }
 
 
-- 
cgit v1.2.3