CVSROOT: /sources/gnash
Module name: gnash
Changes by: Chad Musick <cmusick> 07/11/14 07:36:55
Modified files:
. : ChangeLog
server : PropertyList.cpp
Log message:
Revert last change as being too early.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4852&r2=1.4853
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.cpp?cvsroot=gnash&r1=1.24&r2=1.25
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4852
retrieving revision 1.4853
diff -u -b -r1.4852 -r1.4853
--- ChangeLog 14 Nov 2007 05:12:51 -0000 1.4852
+++ ChangeLog 14 Nov 2007 07:36:54 -0000 1.4853
@@ -1,3 +1,8 @@
+2007-11-14 Chad Musick <[EMAIL PROTECTED]>
+
+ * server/PropertyList.cpp: Revert last change -- it includes new
+ code and is premature.
+
2007-11-14 Zou Lunkai <[EMAIL PROTECTED]>
* server/asobj/Key.cpp: mark built-in properties for Key object, fix a
Index: server/PropertyList.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/PropertyList.cpp 14 Nov 2007 00:21:34 -0000 1.24
+++ server/PropertyList.cpp 14 Nov 2007 07:36:55 -0000 1.25
@@ -27,7 +27,6 @@
#include "log.h"
#include "as_function.h"
-#include "as_environment.h" // for enumerateKeys
#include "as_value.h" // for enumerateValues
#include "VM.h" // For string_table
@@ -46,7 +45,7 @@
PropertyList&
PropertyList::operator=(const PropertyList& pl)
{
- if (this != &pl)
+ if ( this != &pl )
{
clear();
import(pl);
@@ -55,19 +54,19 @@
}
// Should find in any namespace if nsId is 0, and any namespace should find
-// something in namespace 0, unless it is strict.
+// something in namespace 0.
static inline
PropertyList::container::iterator
iterator_find(PropertyList::container &p, string_table::key name,
- string_table::key nsId, bool strict)
+ string_table::key nsId)
{
- if (nsId || strict)
+ if (nsId)
{
PropertyList::container::iterator i =
p.find(boost::make_tuple(name, nsId));
if (i != p.end())
return i;
- return strict ? p.end() : p.find(boost::make_tuple(name, 0));
+ return p.find(boost::make_tuple(name, 0));
}
return p.find(boost::make_tuple(name));
@@ -141,7 +140,7 @@
PropertyList::getValue(const string_table::key key, as_value& val,
as_object& this_ptr, const string_table::key nsId)
{
- container::iterator found = iterator_find(_props, key, nsId, false);
+ container::iterator found = iterator_find(_props, key, nsId);
if (found == _props.end())
return false;
@@ -153,7 +152,7 @@
PropertyList::setValue(string_table::key key, as_value val,
as_object& this_ptr, string_table::key nsId)
{
- container::iterator found = iterator_find(_props, key, nsId, true);
+ container::iterator found = iterator_find(_props, key, nsId);
if (found == _props.end())
{
@@ -171,7 +170,6 @@
return false;
}
- // This should be okay, since val is the only update here.
const_cast<Property*>(&(*found))->setValue(this_ptr, val);
return true;
}
@@ -180,7 +178,7 @@
PropertyList::setFlags(string_table::key key,
int setFlags, int clearFlags, string_table::key nsId)
{
- container::iterator found = iterator_find(_props, key, nsId, false);
+ container::iterator found = iterator_find(_props, key, nsId);
if ( found == _props.end() ) return false;
as_prop_flags& f = const_cast<as_prop_flags&>(found->getFlags());
@@ -208,7 +206,7 @@
Property*
PropertyList::getProperty(string_table::key key, string_table::key nsId)
{
- container::iterator found = iterator_find(_props, key, nsId, false);
+ container::iterator found = iterator_find(_props, key, nsId);
if (found == _props.end()) return NULL;
return const_cast<Property*>(&(*found));
}
@@ -217,7 +215,7 @@
PropertyList::delProperty(string_table::key key, string_table::key nsId)
{
//GNASH_REPORT_FUNCTION;
- container::iterator found = iterator_find(_props, key, nsId, false);
+ container::iterator found = iterator_find(_props, key, nsId);
if (found == _props.end())
{
return std::make_pair(false,false);
@@ -273,28 +271,6 @@
}
void
-PropertyList::enumerateKeys(SafeStack<as_value>& stack,
- propNameSet& donelist) const
-{
- string_table& st = VM::get().getStringTable();
- for (container::const_iterator i = _props.begin(), ie = _props.end();
- i != ie; ++i)
- {
- if (i->getFlags().get_dont_enum())
- continue;
-
- if (donelist.insert(std::make_pair(i->mName,
i->mNamespace)).second)
- {
- if (i->mNamespace)
- stack.push(as_value(st.value(i->mName) + "." +
- st.value(i->mNamespace)));
- else
- stack.push(as_value(st.value(i->mName)));
- }
- }
-}
-
-void
PropertyList::enumerateKeyValue(as_object& this_ptr, std::map<std::string,
std::string>& to)
{
string_table& st = VM::get().getStringTable();
@@ -336,8 +312,7 @@
itEnd = o._props.end(); it != itEnd; ++it)
{
// overwrite any previous property with this name
- container::iterator found = iterator_find(_props, it->mName,
- it->mNamespace, true);
+ container::iterator found = iterator_find(_props, it->mName,
it->mNamespace);
if (found != _props.end())
{
Property a = *it;
@@ -360,13 +335,12 @@
Property a(key, nsId, &getter, &setter);
a.setOrder(- ++mDefaultOrder - 1);
- container::iterator found = iterator_find(_props, key, nsId, true);
- if (found != _props.end() && found->mName == key && found->mNamespace
== nsId)
+ container::iterator found = iterator_find(_props, key, nsId);
+ if (found != _props.end())
{
// copy flags from previous member (even if it's a normal
member ?)
as_prop_flags& f = a.getFlags();
f = found->getFlags();
- a.setOrder(found->getOrder()); // Override order to match
previous.
_props.replace(found, a);
}
else
@@ -381,7 +355,7 @@
PropertyList::addDestructiveGetterSetter(string_table::key key,
as_function& getter, as_function& setter, string_table::key nsId)
{
- container::iterator found = iterator_find(_props, key, nsId, true);
+ container::iterator found = iterator_find(_props, key, nsId);
if (found != _props.end())
return false; // Already exists.
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
