[Gnash-commit] gnash ChangeLog server/asobj/Global.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/06 13:13:13

Modified files:
        .              : ChangeLog 
        server/asobj   : Global.cpp 

Log message:
                * testsuite/actionscript.all/Global.as: correct test count.
                * server/asobj/Global.cpp: forget lexical_cast, use stringstream
                  instead.
                  That both fixes the locale problem and doesn't mess up 
parsing of
                  non-numeric characters.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5819&r2=1.5820
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.93&r2=1.94

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5819
retrieving revision 1.5820
diff -u -b -r1.5819 -r1.5820
--- ChangeLog   6 Mar 2008 13:07:32 -0000       1.5819
+++ ChangeLog   6 Mar 2008 13:13:12 -0000       1.5820
@@ -1,3 +1,10 @@
+2008-03-06 Benjamin Wolsey <address@hidden>
+
+       * testsuite/actionscript.all/Global.as: correct test count.
+       * server/asobj/Global.cpp: forget lexical_cast, use stringstream
+         instead. That both fixes the locale problem and doesn't mess up
+         parsing of non-numeric characters.
+
 2008-03-06 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/MovieClip.as: add test for override

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/asobj/Global.cpp     6 Mar 2008 11:42:34 -0000       1.93
+++ server/asobj/Global.cpp     6 Mar 2008 13:13:12 -0000       1.94
@@ -74,7 +74,7 @@
 #include "xmlsocket.h"
 
 #include <limits> // for numeric_limits<double>::quiet_NaN
-#include <boost/lexical_cast.hpp>
+#include <sstream>
 
 // Common code to warn and return if a required single arg is not present
 // and to warn if there are extra args.
@@ -173,15 +173,18 @@
     ASSERT_FN_ARGS_IS_1
 
     as_value rv;
+    float result;
 
-    try  {
-        float result = boost::lexical_cast<float>(fn.arg(0).to_string());
-        rv = static_cast<double>(result);
-    }
-    catch (boost::bad_lexical_cast& e) {
+    std::istringstream s(fn.arg(0).to_string());
+    
+    s >> result;
+    
+    if (s.tellg() == -1) {
         rv.set_nan();
+        return rv;
     }
 
+    rv = static_cast<double>(result);
     return rv;
 }