Changeset 3511 for trunk/lang/tcl/src/RpUnitsTclInterface.cc

Timestamp:

Mar 16, 2013 9:31:43 AM (11 years ago)

Author:

gah

Message:

fixes for lack of string trim for numbers and unit conversion

File:

• trunk/lang/tcl/src/RpUnitsTclInterface.cc (modified) (3 diffs)

trunk/lang/tcl/src/RpUnitsTclInterface.cc

@@ -38 +38 @@
  */
 
+#include <algorithm> 
+#include <functional>
+#include <cctype>
+
+// Trim from start
+static inline std::string &ltrim(std::string &s) 
+{
+    s.erase(s.begin(), 
+        std::find_if(s.begin(), s.end(), 
+                     std::not1(std::ptr_fun<int, int>(std::isspace))));
+    return s;
+}
+
+// Trim from end
+static inline std::string &rtrim(std::string &s) 
+{
+    s.erase(std::find_if(s.rbegin(), s.rend(), 
+        std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+    return s;
+}
+
+// Trim from both ends
+static inline std::string &trim(std::string &s) 
+{
+    return ltrim(rtrim(s));
+}
+
 extern "C" int
 RpUnits_Init(Tcl_Interp *interp)
@@ -71 +98 @@
  * provided in -context option.
  */
+
 
 int
@@ -208 +236 @@
     // or if we should use those provided in -context option
 
+
+    // Trim away white space from the value.  
+    trim(inValue);
+
     double value;
-    value = strtod(inValue.c_str(),&endptr);
+    value = strtod(inValue.c_str(), &endptr);
     if (endptr == inValue.c_str()) {
         // there was no numeric value that could be pulled from inValue