[Gnash-commit] gnash ./ChangeLog server/action.cpp

[Michael Carlson]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Michael Carlson <address@hidden>        06/02/02 16:10:42

Modified files:
        .              : ChangeLog 
        server         : action.cpp 

Log message:
        Modulus operand in actionscript now returns NaN on division by zero as 
it should

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.61 gnash/ChangeLog:1.62
--- gnash/ChangeLog:1.61        Thu Feb  2 09:40:50 2006
+++ gnash/ChangeLog     Thu Feb  2 16:10:42 2006
@@ -1,6 +1,8 @@
-2006-01-30 Michael Carlson <address@hidden>
+2006-02-03 Michael Carlson <address@hidden>
 
        * server/textformat.cpp: fix typo in textformat_new log message
+       * server/action.cpp: modulus operand in actionscript now returns
+       NaN on division by zero
 
 2006-02-01  Rob Savoye  <address@hidden>
 
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.11 gnash/server/action.cpp:1.12
--- gnash/server/action.cpp:1.11        Wed Feb  1 23:52:44 2006
+++ gnash/server/action.cpp     Thu Feb  2 16:10:42 2006
@@ -2122,12 +2122,10 @@
                                        as_value        result;
                                        double  y = env->pop().to_number();
                                        double  x = env->pop().to_number();
-                                       if (y != 0)
-                                       {
-//                                             
env->top(1).set_double(fmod(env->top(1).to_bool() && env->top(0).to_bool());
-//                                             env->drop(1);
-                                               result = fmod(x, y);
-                                       }
+                                       // Don't need to check for y being 0 
here - if it's zero, fmod returns NaN, which is what flash would do too
+                                       result = fmod(x, y);
+//                                     
env->top(1).set_double(fmod(env->top(1).to_bool() && env->top(0).to_bool());
+//                                     env->drop(1);
 //                                     log_error("modulo x=%f, y=%f, 
z=%f\n",x,y,result.to_number());
                                        env->push(result);
                                        break;