[Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp testsu...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/12 12:03:41

Modified files:
        .              : ChangeLog 
        server/vm      : ASHandlers.cpp 
        testsuite/misc-ming.all: ming_utils.h 

Log message:
                * server/vm/ASHandlers.cpp (ActionPushData): include
                  dictionary offset when printing actions.
                * testsuite/misc-ming.all/ming_utils.h: cleanup documentation
                  for dejagnu-like macros.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2100&r2=1.2101
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2100
retrieving revision 1.2101
diff -u -b -r1.2100 -r1.2101
--- ChangeLog   12 Jan 2007 11:34:33 -0000      1.2100
+++ ChangeLog   12 Jan 2007 12:03:40 -0000      1.2101
@@ -1,5 +1,9 @@
 2007-01-12 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (ActionPushData): include 
+         dictionary offset when printing actions.
+       * testsuite/misc-ming.all/ming_utils.h: cleanup documentation
+         for dejagnu-like macros.
        * testsuite/misc-ming.all/Makefile.am: enable run of
          the insane testcase.
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/vm/ASHandlers.cpp    9 Jan 2007 02:13:58 -0000       1.26
+++ server/vm/ASHandlers.cpp    12 Jan 2007 12:03:41 -0000      1.27
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: ASHandlers.cpp,v 1.26 2007/01/09 02:13:58 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.27 2007/01/12 12:03:41 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1526,6 +1526,9 @@
        size_t i = pc;
        size_t count = 0;
        while (i - pc < static_cast<size_t>(length)) {
+               int id; // for dict (constant pool) lookup
+                       // declared here because also used
+                       // by verbose action output
                uint8_t type = code[3 + i];
                i++;
 
@@ -1621,7 +1624,7 @@
 
                        case pushDict8: // 8
                        {
-                               int id = code[3 + i];
+                               id = code[3 + i];
                                i++;
                                if ( id < (int) code.dictionary_size() )
                                {
@@ -1640,7 +1643,7 @@
 
                        case pushDict16: // 9
                        {
-                               int id = code.read_int16(i+3);
+                               id = code.read_int16(i+3);
                                i += 2;
                                if ( id < (int) code.dictionary_size() )
                                {
@@ -1659,8 +1662,14 @@
                }
 
                IF_VERBOSE_ACTION (
-                     log_action("\t%d) type=%s, value=%s",
-                             count, pushType[type], env.top(0).to_string());
+               if ( type == pushDict8 || type == pushDict16 )
+               {
+                       log_action("\t%d) type=%s (%d), value=%s", count, 
pushType[type], id, env.top(0).to_string());
+               }
+               else
+               {
+                       log_action("\t%d) type=%s, value=%s", count, 
pushType[type], env.top(0).to_string());
+               }
                        ++count;
                );
        }

Index: testsuite/misc-ming.all/ming_utils.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/misc-ming.all/ming_utils.h        31 Dec 2006 11:12:18 -0000      
1.11
+++ testsuite/misc-ming.all/ming_utils.h        12 Jan 2007 12:03:41 -0000      
1.12
@@ -77,17 +77,24 @@
  *
  * @param expr
  *   The ActionScript expression
- *
- * @param expected_failure
- *   Set to 1 if a failure is expected
  */
-//void check(SWFMovie mo, const char* expr, int expected_failure);
 #define check(m, expr)  \
        SWFMovie_add(m, (SWFBlock)compile_actions("\
                if ( %s ) pass( \"%s [%s:%d]\"); \
                else fail( \"%s [%s:%d] \"); \
                ", expr, expr, __FILE__, __LINE__, expr, __FILE__, __LINE__));
 
+/** \brief
+ * Evaluate ActionScript 'expr' expression updating the global TestState.
+ * Expect a failure.
+ * (make sure you called add_dejagnu_functions before using this function)
+ *
+ * @param mo
+ *   The SWFMovie to add the DO_ACTION block to
+ *
+ * @param expr
+ *   The ActionScript expression
+ */
 #define xcheck(m, expr)  \
        SWFMovie_add(m, (SWFBlock)compile_actions("\
                if ( %s ) xpass( \"%s [%s:%d]\"); \
@@ -109,16 +116,28 @@
  * @param expected
  *   The ActionScript expression we expect to equal the obtained one
  *
- * @param expected_failure
- *   Set to 1 if a failure is expected
  */
-//void check_equals(SWFMovie mo, const char* obtained, const char* expected, 
int expected_failure);
 #define check_equals(m, obt, exp)  \
        SWFMovie_add(m, (SWFBlock)compile_actions("\
                if ( %s == %s ) pass( \"%s  ==  %s [%s:%d]\"); \
                else fail( \"expected: %s obtained: \" + obt + \" [%s:%d] \"); \
                ", obt, exp, obt, exp, __FILE__, __LINE__, exp, __FILE__, 
__LINE__));
 
+/** \brief
+ * Evaluate equality of two ActionScript expressions updating the global
+ * TestState accordingly. Expect a failure.
+ * (make sure you called add_dejagnu_functions before using this function)
+ *
+ * @param mo
+ *   The SWFMovie to add the DO_ACTION block to
+ *
+ * @param obtained
+ *   The ActionScript expression we are testing
+ *
+ * @param expected
+ *   The ActionScript expression we expect to equal the obtained one
+ *
+ */
 #define xcheck_equals(m, obt, exp)  \
        SWFMovie_add(m, (SWFBlock)compile_actions("\
                if ( %s == %s ) xpass( \"%s  ==  %s [%s:%d]\"); \