[Gnash-commit] gnash ChangeLog server/PropertyList.cpp testsui...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/24 22:43:23

Modified files:
        .              : ChangeLog 
        server         : PropertyList.cpp 
        testsuite/swfdec: PASSING gen_run_swfdec_testsuite.sh 

Log message:
                * server/PropertyList.cpp: addProperty can always override
                  pre-existing properties, and inherits flags in that case.
                * testsuite/swfdec/PASSING: addProperty-flags succeeds.
                * testsuite/swfdec/gen_run_swfdec_testsuite.sh: include md5
                  in PASS/FAIL lines (for easier copy&paste into PASSING)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4696&r2=1.4697
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4696
retrieving revision 1.4697
diff -u -b -r1.4696 -r1.4697
--- ChangeLog   24 Oct 2007 21:55:32 -0000      1.4696
+++ ChangeLog   24 Oct 2007 22:43:22 -0000      1.4697
@@ -1,5 +1,13 @@
 2007-10-24 Sandro Santilli <address@hidden>
 
+       * server/PropertyList.cpp: addProperty can always override
+         pre-existing properties, and inherits flags in that case.
+       * testsuite/swfdec/PASSING: addProperty-flags succeeds.
+       * testsuite/swfdec/gen_run_swfdec_testsuite.sh: include md5 
+         in PASS/FAIL lines (for easier copy&paste into PASSING)
+
+2007-10-24 Sandro Santilli <address@hidden>
+
        * server/asobj/Object.cpp: don't replicate all exported interfaces
          to the Object class; move registerClass from prototype to class;
          have hasOwnProperty return false on invalid calls.

Index: server/PropertyList.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/PropertyList.cpp     18 Oct 2007 11:47:53 -0000      1.22
+++ server/PropertyList.cpp     24 Oct 2007 22:43:23 -0000      1.23
@@ -333,16 +333,22 @@
 PropertyList::addGetterSetter(string_table::key key, as_function& getter,
        as_function& setter, string_table::key nsId)
 {
+       Property a(key, nsId, &getter, &setter);
+       a.setOrder(- ++mDefaultOrder - 1);
+
        container::iterator found = iterator_find(_props, key, nsId);
        if (found != _props.end())
        {
-               assert(0);
-               return false; // already exists !!
+               // copy flags from previous member (even if it's a normal 
member ?)
+               as_prop_flags& f = a.getFlags();
+               f = found->getFlags();
+               _props.replace(found, a);
        }
-
-       Property a(key, nsId, &getter, &setter);
-       a.setOrder(- ++mDefaultOrder - 1);
+       else
+       {
        _props.insert(a);
+       }
+
        return true;
 }
 

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- testsuite/swfdec/PASSING    24 Oct 2007 19:34:45 -0000      1.44
+++ testsuite/swfdec/PASSING    24 Oct 2007 22:43:23 -0000      1.45
@@ -7,6 +7,9 @@
 addProperty-5.swf:00e23fa4da0445805c0c4ea3f54a140d
 addProperty-delete-5.swf:27b4309647c2ef74ec4ce8caea05f4bd
 addProperty-flags-5.swf:16a729f3d956fd1287236873fb26fac4
+addProperty-flags-6.swf:574869d2213ee609d3f2910dabecaa80
+addProperty-flags-7.swf:b52073016bf68198756bdc210e0d2b41
+addProperty-flags-8.swf:ea8394da5440ae1984d1f5ebecd994a0
 addProperty-get-prototypes-5.swf:b2fddb30218da718880a97ea4a10cf4b
 addProperty-get-prototypes-6.swf:5ff58334e7bfbd2aed87b28cf8c30959
 addProperty-get-prototypes-7.swf:db2e8ce9695eb081b9c01da90d0e494f

Index: testsuite/swfdec/gen_run_swfdec_testsuite.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/swfdec/gen_run_swfdec_testsuite.sh        24 Oct 2007 20:04:46 
-0000      1.5
+++ testsuite/swfdec/gen_run_swfdec_testsuite.sh        24 Oct 2007 22:43:23 
-0000      1.6
@@ -45,22 +45,23 @@
 for test in \`ls ${SWFDECTRACEDIR}/*.swf\`; do
        testname=\`basename \${test}\`
        md5=\`md5sum \${test} | cut -d' ' -f1\`
+       testid="\${test}:\${md5}"
        expectpass=no
-       if grep -q "^\${testname}:\${md5}\$" \${EXPECTPASS}; then
+       if grep -q "^\${testid}\$" \${EXPECTPASS}; then
                expectpass="yes"
        fi
-       echo "NOTE: running \${testname}:\${md5} (expect pass: \${expectpass})"
+       echo "NOTE: running \${testname} (expect pass: \${expectpass})"
        if ${SWFDEC_GNASH_TESTER} \${test} > \${testname}.log; then
                if [ "\${expectpass}" = "yes" ]; then
-                       echo "PASSED: \${test}"
+                       echo "PASSED: \${testid}"
                else
-                       echo "XPASSED: \${test}"
+                       echo "XPASSED: \${testid}"
                fi      
        else
                if [ "\${expectpass}" = "yes" ]; then
-                       echo "FAILED: \${testname} (traces in 
\${testname}.trace-gnash, log in \${testname}.log)"
+                       echo "FAILED: \${testid} (traces in 
\${testname}.trace-gnash, log in \${testname}.log)"
                else
-                       echo "XFAILED: \${testname} (traces in 
\${testname}.trace-gnash, log in \${testname}.log)"
+                       echo "XFAILED: \${testid} (traces in 
\${testname}.trace-gnash, log in \${testname}.log)"
                fi
        fi
 done