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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/09 15:36:57

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 
        testsuite/misc-ming.all: Makefile.am 

Log message:
                * server/as_environment.cpp: don't use size() or length()
                  when empty() is really meant (in some cases empty() is much
                  faster).
                * testsuite/misc-ming.all/Makefile.am: remove duplicate rule
                  for PlaceObject2Test.swf (fixes make check).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4576&r2=1.4577
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.160&r2=1.161

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4576
retrieving revision 1.4577
diff -u -b -r1.4576 -r1.4577
--- ChangeLog   9 Oct 2007 12:48:43 -0000       1.4576
+++ ChangeLog   9 Oct 2007 15:36:56 -0000       1.4577
@@ -1,3 +1,11 @@
+2007-10-09 Sandro Santilli <address@hidden>
+
+       * server/as_environment.cpp: don't use size() or length()
+         when empty() is really meant (in some cases empty() is much
+         faster).
+       * testsuite/misc-ming.all/Makefile.am: remove duplicate rule
+         for PlaceObject2Test.swf (fixes make check).
+
 2007-10-09 Benjamin Wolsey <address@hidden>
 
        * server/asobj/Key.{cpp,h}: rename m_last_key_pressed to 

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/as_environment.cpp   30 Sep 2007 05:24:36 -0000      1.93
+++ server/as_environment.cpp   9 Oct 2007 15:36:57 -0000       1.94
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.93 2007/09/30 05:24:36 zoulunkai Exp $ */
+/* $Id: as_environment.cpp,v 1.94 2007/10/09 15:36:57 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -187,9 +187,7 @@
     const ScopeStack& scopeStack) 
     // varname must be a plain variable name; no path parsing.
 {
-       assert(strchr(varname.c_str(), ':') == NULL);
-       assert(strchr(varname.c_str(), '/') == NULL);
-       assert(strchr(varname.c_str(), '.') == NULL);
+       assert( ! strpbrk(varname.c_str(), ":/.") );
 
        string_table::key varkey = VM::get().getStringTable().find(varname);
        as_value        val;
@@ -333,7 +331,7 @@
 {
        // why would you want to set a local if there's no call frame on the
        // stack ?
-       assert(_localFrames.size());
+       assert( ! _localFrames.empty() );
 
        string_table::key varkey = VM::get().getStringTable().find(varname);
        // Is it in the current frame already?
@@ -344,8 +342,7 @@
        else
        {
                // Not in frame; create a new local var.
-               assert(_localFrames.size());
-               assert(varname.length() > 0);   // null varnames are invalid!
+               assert( ! varname.empty() ); // null varnames are invalid!
                LocalVars& locals = _localFrames.back().locals;
                //locals.push_back(as_environment::frame_slot(varname, val));
                locals->set_member(varkey, val);
@@ -360,8 +357,8 @@
        if ( ! findLocal(varname, tmp) )
        {
                // Not in frame; create a new local var.
-               assert(_localFrames.size());
-               assert(varname.length() > 0);   // null varnames are invalid!
+               assert( ! _localFrames.empty() );
+               assert( ! varname.empty() );    // null varnames are invalid!
                LocalVars& locals = _localFrames.back().locals;
                //locals.push_back(as_environment::frame_slot(varname, 
as_value()));
                locals->set_member(VM::get().getStringTable().find(varname), 
as_value());
@@ -1056,8 +1053,8 @@
 void
 as_environment::add_local(const std::string& varname, const as_value& val)
 {
-       assert(varname.length() > 0);   // null varnames are invalid!
-       assert(_localFrames.size());
+       assert( ! varname.empty() );    // null varnames are invalid!
+       assert( ! _localFrames.empty() );
        LocalVars& locals = _localFrames.back().locals;
        //locals.push_back(frame_slot(varname, val));
        locals->set_member(VM::get().getStringTable().find(varname), val);

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- testsuite/misc-ming.all/Makefile.am 9 Oct 2007 09:06:26 -0000       1.160
+++ testsuite/misc-ming.all/Makefile.am 9 Oct 2007 15:36:57 -0000       1.161
@@ -1411,9 +1411,6 @@
 spritehier.swf: spritehier
        ./spritehier
 
-PlaceObject2Test.swf: PlaceObject2Test 
-       ./PlaceObject2Test
-
 RemoveObject2Test.swf: RemoveObject2Test 
        ./RemoveObject2Test