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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/04 14:46:35

Modified files:
        .              : ChangeLog 
        server         : as_object.cpp 

Log message:
        (set_member_default): minor cleanups.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1029&r2=1.1030
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1029
retrieving revision 1.1030
diff -u -b -r1.1029 -r1.1030
--- ChangeLog   4 Oct 2006 14:07:30 -0000       1.1029
+++ ChangeLog   4 Oct 2006 14:46:35 -0000       1.1030
@@ -1,5 +1,6 @@
 2006-10-04 Sandro Santilli  <address@hidden>
 
+       * server/as_object.cpp (set_member_default): minor cleanups.
        * testsuite/libbase/Makefile.am: added required boost lib
          (couldn't find a way to have the dependency derived from
          libgnashbase.la)

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/as_object.cpp        4 Oct 2006 09:42:19 -0000       1.9
+++ server/as_object.cpp        4 Oct 2006 14:46:35 -0000       1.10
@@ -120,16 +120,20 @@
 void
 as_object::set_member_default(const tu_stringi& name, const as_value& val )
 {
-       //printf("SET MEMBER: %s at %p for object %p\n", name.c_str(), 
val.to_object(), this);
+       //printf("SET MEMBER: %s = %s for object %p\n", name.c_str(), 
val.to_string(), this);
        if (name == "__proto__") 
        {
                set_prototype(val.to_object());
+               return;
        }
-       else
-       {
+
                stringi_hash<as_member>::const_iterator it = 
this->m_members.find(name);
                
-               if ( it != this->m_members.end() ) {
+       if ( it == this->m_members.end() )
+       {
+               m_members[name] = as_member(val);
+               return;
+       }
 
                        const as_prop_flags flags = 
(it->second).get_member_flags();
 
@@ -137,11 +141,6 @@
                        if (!flags.get_read_only()) {
                                m_members[name] = as_member(val, flags);
                        }
-
-               } else {
-                       m_members[name] = as_member(val);
-               }
-       }
 }
 
 bool