JavaScriptCore-1097.3.tar.gz

[apple/javascriptcore.git] / runtime / JSStaticScopeObject.cpp

diff --git a/runtime/JSStaticScopeObject.cpp b/runtime/JSStaticScopeObject.cpp
index 4196822b7291292de4a5e028f76d2b138be0951a..f8942b5f865db59e1542dc4e3b5c7cf279c17163 100644 (file)
--- a/runtime/JSStaticScopeObject.cpp
+++ b/runtime/JSStaticScopeObject.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -27,58 +27,69 @@
 
 #include "JSStaticScopeObject.h"
 
 
 #include "JSStaticScopeObject.h"
 

-namespace JSC {
+#include "Error.h"

 
 

+namespace JSC {

 ASSERT_CLASS_FITS_IN_CELL(JSStaticScopeObject);
 
 ASSERT_CLASS_FITS_IN_CELL(JSStaticScopeObject);
 

-void JSStaticScopeObject::mark()
+const ClassInfo JSStaticScopeObject::s_info = { "Object", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSStaticScopeObject) };
+
+void JSStaticScopeObject::destroy(JSCell* cell)

 {
 {

-    JSVariableObject::mark();
-    
-    if (!d()->registerStore.marked())
-        d()->registerStore.mark();
+    jsCast<JSStaticScopeObject*>(cell)->JSStaticScopeObject::~JSStaticScopeObject();

 }
 
 }
 

-JSObject* JSStaticScopeObject::toThisObject(ExecState* exec) const
+void JSStaticScopeObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
+{
+    JSStaticScopeObject* thisObject = jsCast<JSStaticScopeObject*>(cell);
+    ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
+    COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
+    ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
+    JSVariableObject::visitChildren(thisObject, visitor);
+    visitor.append(&thisObject->m_registerStore);
+}
+
+JSObject* JSStaticScopeObject::toThisObject(JSCell*, ExecState* exec)

 {
     return exec->globalThisValue();
 }
 
 {
     return exec->globalThisValue();
 }
 

-void JSStaticScopeObject::put(ExecState*, const Identifier& propertyName, JSValuePtr value, PutPropertySlot&)
+void JSStaticScopeObject::put(JSCell* cell, ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)

 {
 {

-    if (symbolTablePut(propertyName, value))
+    JSStaticScopeObject* thisObject = jsCast<JSStaticScopeObject*>(cell);
+    if (slot.isStrictMode()) {
+        // Double lookup in strict mode, but this only occurs when
+        // a) indirectly writing to an exception slot
+        // b) writing to a function expression name
+        // (a) is unlikely, and (b) is an error.
+        // Also with a single entry the symbol table lookup should simply be
+        // a pointer compare.
+        PropertySlot slot;
+        bool isWritable = true;
+        thisObject->symbolTableGet(propertyName, slot, isWritable);
+        if (!isWritable) {
+            throwError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
+            return;
+        }
+    }
+    if (thisObject->symbolTablePut(exec, propertyName, value, slot.isStrictMode()))

         return;
     
     ASSERT_NOT_REACHED();
 }
 
         return;
     
     ASSERT_NOT_REACHED();
 }
 

-void JSStaticScopeObject::putWithAttributes(ExecState*, const Identifier& propertyName, JSValuePtr value, unsigned attributes)
+void JSStaticScopeObject::putDirectVirtual(JSObject* object, ExecState* exec, const Identifier& propertyName, JSValue value, unsigned attributes)

 {
 {

-    if (symbolTablePutWithAttributes(propertyName, value, attributes))
+    JSStaticScopeObject* thisObject = jsCast<JSStaticScopeObject*>(object);
+    if (thisObject->symbolTablePutWithAttributes(exec->globalData(), propertyName, value, attributes))

         return;
     
     ASSERT_NOT_REACHED();
 }
 
         return;
     
     ASSERT_NOT_REACHED();
 }
 

-bool JSStaticScopeObject::isDynamicScope() const
-{
-    return false;
-}
-
-JSStaticScopeObject::~JSStaticScopeObject()
-{
-    ASSERT(d());
-    delete d();
-}
-
-inline bool JSStaticScopeObject::getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot& slot)
-{
-    return symbolTableGet(propertyName, slot);
-}
-
-inline bool JSStaticScopeObject::getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot& slot, bool& slotIsWriteable)
+bool JSStaticScopeObject::getOwnPropertySlot(JSCell* cell, ExecState*, const Identifier& propertyName, PropertySlot& slot)

 {
 {

-    return symbolTableGet(propertyName, slot, slotIsWriteable);
+    return jsCast<JSStaticScopeObject*>(cell)->symbolTableGet(propertyName, slot);

 }
 
 }
 }
 
 }