Changeset 10289 for trunk/FACT++/src/StateMachineImp.cc

Timestamp:

04/05/11 12:08:24 (14 years ago)

Author:

tbretz

Message:

The Converter functions now throw exceptions. The previous way of reporting a conversion error was not convenient.

File:

• trunk/FACT++/src/StateMachineImp.cc (modified) (1 diff)

trunk/FACT++/src/StateMachineImp.cc

@@ -234 +234 @@
 
     const Converter conv(lout, fmt, false);
-
-    const vector<char> v = conv.GetVector(str.substr(p0));
-    if (!conv.valid() || v.empty()!=conv.empty())
-    {
-        lout << kRed << "Couldn't properly parse the input... ignored." << endl;
+    if (!conv)
+    {
+        lout << kRed << "Couldn't properly parse the format... ignored." << endl;
         return false;
     }
 
-    return PostEvent(*evt, v.data(), v.size());
-/*
-    const Converter c(lout, fmt, str.substr(p0));
-
-    // Parsing was not successfull
-    if (!c.GetRc())
-    {
-        lout << kRed << "Couldn't properly parse the input... ignored." << endl;
-        return false;
-    }
-
-    return PostEvent(*evt, c.Ptr(), c.Size());
-    */
+    try
+    {
+        const vector<char> v = conv.GetVector(str.substr(p0));
+        return PostEvent(*evt, v.data(), v.size());
+    }
+    catch (const std::runtime_error &e)
+    {
+        lout << kRed << e.what() << endl;
+    }
+
+    return false;
 }