[Gnash-commit] gnash ChangeLog server/as_environment.cpp tests...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/09 19:46:42

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 
        testsuite/actionscript.all: delete.as 

Log message:
                * server/as_environment.cpp (del_variable_raw): try to delete 
from
                  _global if anything else fails.
                * testsuite/actionscript.all/delete.as: xcheck => check as 
delete
                  from _global now works fine.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1905&r2=1.1906
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/delete.as?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1905
retrieving revision 1.1906
diff -u -b -r1.1905 -r1.1906
--- ChangeLog   9 Dec 2006 19:33:31 -0000       1.1905
+++ ChangeLog   9 Dec 2006 19:46:42 -0000       1.1906
@@ -1,5 +1,12 @@
 2006-12-09 Sandro Santilli <address@hidden>
 
+       * server/as_environment.cpp (del_variable_raw): try to delete from
+         _global if anything else fails.
+       * testsuite/actionscript.all/delete.as: xcheck => check as delete
+         from _global now works fine.
+
+2006-12-09 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/delete.as: added "scoped delete" as of
          bug #18482, but using ActionDelete rather then ActionDelete2 which
          is used in the bug item testcase. Gnash is currently failing to

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/as_environment.cpp   9 Dec 2006 00:38:28 -0000       1.37
+++ server/as_environment.cpp   9 Dec 2006 19:46:42 -0000       1.38
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.37 2006/12/09 00:38:28 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.38 2006/12/09 19:46:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -163,7 +163,15 @@
     }
 
     // Try target
-    return m_target->delProperty(varname);
+    if ( m_target->delProperty(varname) ) {
+       // TODO: this is surely wrong, we don't want to keep seeking
+       // if a property is found probably, even if it's flags forbid deletion
+       // var is deletable in this context
+        return true;
+    }
+
+    // Try _global
+    return VM::get().getGlobal()->delProperty(varname);
 }
 
 // varname must be a plain variable name; no path parsing.

Index: testsuite/actionscript.all/delete.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/delete.as,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/actionscript.all/delete.as        9 Dec 2006 19:33:31 -0000       
1.5
+++ testsuite/actionscript.all/delete.as        9 Dec 2006 19:46:42 -0000       
1.6
@@ -1,4 +1,4 @@
-rcsid="$Id: delete.as,v 1.5 2006/12/09 19:33:31 strk Exp $";
+rcsid="$Id: delete.as,v 1.6 2006/12/09 19:46:42 strk Exp $";
 
 #include "check.as"
 
@@ -21,8 +21,7 @@
        check_equals(a, "a");
        check(delete a);
        check_equals(a, "_global.a");
-       // it seems our 'delete' thing is failing to seek in _global..
-       xcheck(delete a);
-       xcheck_equals(a, undefined);
+       check(delete a);
+       check_equals(a, undefined);
        check(!delete a);
 }