Changeset 2882 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 26, 2002, 3:34:56 PM (23 years ago)

Author:

darin

Message:

• kjs/property_map.cpp: (PropertyMap::save): Look at the attributes the same way in the single hash entry case as in the actual hash table case. Change the rule for which attributes to save to "attributes that don't have the ReadOnly, DontEnum, or Function bit set". Also fix bug where saving an empty property map would leave the count set to the old value.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ChangeLog-2002-12-03 (modified) (1 diff)
• ChangeLog-2003-10-25 (modified) (1 diff)
• kjs/property_map.cpp (modified) (10 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2002-11-26  Darin Adler  <[email protected]>
+
+        * kjs/property_map.cpp:
+        (PropertyMap::save): Look at the attributes the same way in the single hash entry
+        case as in the actual hash table case. Change the rule for which attributes to save
+        to "attributes that don't have the ReadOnly, DontEnum, or Function bit set".
+        Also fix bug where saving an empty property map would leave the count set to the old value.
+
 2002-11-26  Richard Williamson   <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2002-12-03

@@ +1 @@
+2002-11-26  Darin Adler  <[email protected]>
+
+        * kjs/property_map.cpp:
+        (PropertyMap::save): Look at the attributes the same way in the single hash entry
+        case as in the actual hash table case. Change the rule for which attributes to save
+        to "attributes that don't have the ReadOnly, DontEnum, or Function bit set".
+        Also fix bug where saving an empty property map would leave the count set to the old value.
+
 2002-11-26  Richard Williamson   <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2003-10-25

@@ +1 @@
+2002-11-26  Darin Adler  <[email protected]>
+
+        * kjs/property_map.cpp:
+        (PropertyMap::save): Look at the attributes the same way in the single hash entry
+        case as in the actual hash table case. Change the rule for which attributes to save
+        to "attributes that don't have the ReadOnly, DontEnum, or Function bit set".
+        Also fix bug where saving an empty property map would leave the count set to the old value.
+
 2002-11-26  Richard Williamson   <[email protected]>
 

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -25 +25 @@
 #include "reference_list.h"
 
+#define DEBUG_PROPERTIES 0
 #define DO_CONSISTENCY_CHECK 0
 #define DUMP_STATISTICS 0
@@ -62 +63 @@
     PropertyMapHashTableEntry entries[1];
 };
-    
+
 class SavedProperty {
 public:
@@ -74 +75 @@
 SavedProperties::~SavedProperties()
 {
-    if (_properties){
-        delete [] _properties;
-    }
+    delete [] _properties;
 }
 
@@ -188 +187 @@
 }
 
-#ifdef DEBUG_PROPERTIES
+#if DEBUG_PROPERTIES
 static void printAttributes(int attributes)
 {
@@ -212 +211 @@
     UString::Rep *rep = name._ustring.rep;
     
-#ifdef DEBUG_PROPERTIES
+#if DEBUG_PROPERTIES
     printf ("adding property %s, attributes = 0x%08x (", name.ascii(), attributes);
     printAttributes(attributes);
@@ -440 +439 @@
     if (!_table) {
 #if USE_SINGLE_ENTRY
-        if (_singleEntry.key)
+        if (_singleEntry.key && !(_singleEntry.attributes & (ReadOnly | DontEnum | Function)))
             ++count;
 #endif
     } else {
         for (int i = 0; i != _table->size; ++i)
-            if (_table->entries[i].key && (_table->entries[i].attributes == 0 || _table->entries[i].attributes == (DontDelete | Internal)))
-            //if (_table->entries[i].key)
+            if (_table->entries[i].key && !(_table->entries[i].attributes & (ReadOnly | DontEnum | Function)))
                 ++count;
     }
 
     delete [] p._properties;
+
+    p._count = count;
+
     if (count == 0) {
         p._properties = 0;
@@ -457 +458 @@
     
     p._properties = new SavedProperty [count];
-    p._count = count;
     
     SavedProperty *prop = p._properties;
@@ -463 +463 @@
     if (!_table) {
 #if USE_SINGLE_ENTRY
-        if (_singleEntry.key) {
+        if (_singleEntry.key && !(_singleEntry.attributes & (ReadOnly | DontEnum | Function))) {
             prop->key = Identifier(_singleEntry.key);
             prop->value = Value(_singleEntry.value);
+            prop->attributes = _singleEntry.attributes;
             ++prop;
         }
@@ -471 +472 @@
     } else {
         for (int i = 0; i != _table->size; ++i) {
-            if (_table->entries[i].key && (_table->entries[i].attributes == 0 || _table->entries[i].attributes == (DontDelete | Internal))) {
-            //if (_table->entries[i].key) {
+            if (_table->entries[i].key && !(_table->entries[i].attributes & (ReadOnly | DontEnum | Function))) {
                 prop->key = Identifier(_table->entries[i].key);
                 prop->value = Value(_table->entries[i].value);
@@ -484 +484 @@
 void PropertyMap::restore(const SavedProperties &p)
 {
-    for (int i = 0; i != p._count; ++i){
+    for (int i = 0; i != p._count; ++i)
         put(p._properties[i].key, p._properties[i].value.imp(), p._properties[i].attributes);
-    }
 }