Reviewers: Lasse Reichstein, Mads Ager,
Message:
Couple of renames.
Description:
Renaming strict to strict_mode for uniformity.
BUG=
TEST=
Please review this at http://codereview.chromium.org/6611003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/handles.h
M src/handles.cc
M src/objects.h
M src/objects.cc
M src/runtime.h
M src/runtime.cc
M src/stub-cache.cc
Index: src/handles.cc
diff --git a/src/handles.cc b/src/handles.cc
index
05c81bb3f5241882cdddeed73331fcf4b1280c54..d91855c1d756b9097f211e477464bb8ca082ea2a
100644
--- a/src/handles.cc
+++ b/src/handles.cc
@@ -243,8 +243,8 @@ Handle<Object> SetProperty(Handle<JSObject> object,
Handle<String> key,
Handle<Object> value,
PropertyAttributes attributes,
- StrictModeFlag strict) {
- CALL_HEAP_FUNCTION(object->SetProperty(*key, *value, attributes, strict),
+ StrictModeFlag strict_mode) {
+ CALL_HEAP_FUNCTION(object->SetProperty(*key, *value, attributes,
strict_mode),
Object);
}
@@ -253,9 +253,9 @@ Handle<Object> SetProperty(Handle<Object> object,
Handle<Object> key,
Handle<Object> value,
PropertyAttributes attributes,
- StrictModeFlag strict) {
+ StrictModeFlag strict_mode) {
CALL_HEAP_FUNCTION(
- Runtime::SetObjectProperty(object, key, value, attributes, strict),
+ Runtime::SetObjectProperty(object, key, value, attributes,
strict_mode),
Object);
}
@@ -309,11 +309,11 @@ Handle<Object>
SetPropertyWithInterceptor(Handle<JSObject> object,
Handle<String> key,
Handle<Object> value,
PropertyAttributes attributes,
- StrictModeFlag strict) {
+ StrictModeFlag strict_mode) {
CALL_HEAP_FUNCTION(object->SetPropertyWithInterceptor(*key,
*value,
attributes,
- strict),
+ strict_mode),
Object);
}
Index: src/handles.h
diff --git a/src/handles.h b/src/handles.h
index
9d3588bf9a6fa6f291a9b544a3bd6a7b8e23cf57..ccdf4d532759e1607046a7f87628f539cb0b5b56
100644
--- a/src/handles.h
+++ b/src/handles.h
@@ -224,13 +224,13 @@ Handle<Object> SetProperty(Handle<JSObject> object,
Handle<String> key,
Handle<Object> value,
PropertyAttributes attributes,
- StrictModeFlag strict);
+ StrictModeFlag strict_mode);
Handle<Object> SetProperty(Handle<Object> object,
Handle<Object> key,
Handle<Object> value,
PropertyAttributes attributes,
- StrictModeFlag strict);
+ StrictModeFlag strict_mode);
Handle<Object> ForceSetProperty(Handle<JSObject> object,
Handle<Object> key,
@@ -262,7 +262,7 @@ Handle<Object>
SetPropertyWithInterceptor(Handle<JSObject> object,
Handle<String> key,
Handle<Object> value,
PropertyAttributes attributes,
- StrictModeFlag strict);
+ StrictModeFlag strict_mode);
Handle<Object> SetElement(Handle<JSObject> object,
uint32_t index,
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index
0b7f60a908f07f45efe0b2a48c26e1362f74a76d..1197de9a8cc184980a5841a6e5db4ac2e85df0b4
100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -1445,14 +1445,14 @@ MaybeObject* JSObject::SetPropertyPostInterceptor(
String* name,
Object* value,
PropertyAttributes attributes,
- StrictModeFlag strict) {
+ StrictModeFlag strict_mode) {
// Check local property, ignore interceptor.
LookupResult result;
LocalLookupRealNamedProperty(name, &result);
if (result.IsFound()) {
// An existing property, a map transition or a null descriptor was
// found. Use set property to handle all these cases.
- return SetProperty(&result, name, value, attributes, strict);
+ return SetProperty(&result, name, value, attributes, strict_mode);
}
// Add a new real property.
return AddProperty(name, value, attributes);
@@ -1578,7 +1578,7 @@ MaybeObject* JSObject::SetPropertyWithInterceptor(
String* name,
Object* value,
PropertyAttributes attributes,
- StrictModeFlag strict) {
+ StrictModeFlag strict_mode) {
HandleScope scope;
Handle<JSObject> this_handle(this);
Handle<String> name_handle(name);
@@ -1608,7 +1608,7 @@ MaybeObject* JSObject::SetPropertyWithInterceptor(
this_handle->SetPropertyPostInterceptor(*name_handle,
*value_handle,
attributes,
- strict);
+ strict_mode);
RETURN_IF_SCHEDULED_EXCEPTION();
return raw_result;
}
@@ -1617,10 +1617,10 @@ MaybeObject* JSObject::SetPropertyWithInterceptor(
MaybeObject* JSObject::SetProperty(String* name,
Object* value,
PropertyAttributes attributes,
- StrictModeFlag strict) {
+ StrictModeFlag strict_mode) {
LookupResult result;
LocalLookup(name, &result);
- return SetProperty(&result, name, value, attributes, strict);
+ return SetProperty(&result, name, value, attributes, strict_mode);
}
@@ -1901,7 +1901,7 @@ MaybeObject* JSObject::SetProperty(LookupResult*
result,
String* name,
Object* value,
PropertyAttributes attributes,
- StrictModeFlag strict) {
+ StrictModeFlag strict_mode) {
// Make sure that the top context does not change when doing callbacks or
// interceptor calls.
AssertNoContextChange ncc;
@@ -1929,7 +1929,7 @@ MaybeObject* JSObject::SetProperty(LookupResult*
result,
if (proto->IsNull()) return value;
ASSERT(proto->IsJSGlobalObject());
return JSObject::cast(proto)->SetProperty(
- result, name, value, attributes, strict);
+ result, name, value, attributes, strict_mode);
}
if (!result->IsProperty() && !IsJSContextExtensionObject()) {
@@ -1949,7 +1949,7 @@ MaybeObject* JSObject::SetProperty(LookupResult*
result,
return AddProperty(name, value, attributes);
}
if (result->IsReadOnly() && result->IsProperty()) {
- if (strict == kStrictMode) {
+ if (strict_mode == kStrictMode) {
HandleScope scope;
Handle<String> key(name);
Handle<Object> holder(this);
@@ -1988,7 +1988,7 @@ MaybeObject* JSObject::SetProperty(LookupResult*
result,
value,
result->holder());
case INTERCEPTOR:
- return SetPropertyWithInterceptor(name, value, attributes, strict);
+ return SetPropertyWithInterceptor(name, value, attributes,
strict_mode);
case CONSTANT_TRANSITION: {
// If the same constant function is being added we can simply
// transition to the target map.
Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index
de15a7398d7fd8c86242247e778a724153cef8a7..809114dbb665c24a7d60d1cf3f369c97110bdef7
100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -1362,12 +1362,12 @@ class JSObject: public HeapObject {
MUST_USE_RESULT MaybeObject* SetProperty(String* key,
Object* value,
PropertyAttributes attributes,
- StrictModeFlag strict);
+ StrictModeFlag strict_mode);
MUST_USE_RESULT MaybeObject* SetProperty(LookupResult* result,
String* key,
Object* value,
PropertyAttributes attributes,
- StrictModeFlag strict);
+ StrictModeFlag strict_mode);
MUST_USE_RESULT MaybeObject* SetPropertyWithFailedAccessCheck(
LookupResult* result,
String* name,
@@ -1383,12 +1383,12 @@ class JSObject: public HeapObject {
String* name,
Object* value,
PropertyAttributes attributes,
- StrictModeFlag strict);
+ StrictModeFlag strict_mode);
MUST_USE_RESULT MaybeObject* SetPropertyPostInterceptor(
String* name,
Object* value,
PropertyAttributes attributes,
- StrictModeFlag strict);
+ StrictModeFlag strict_mode);
MUST_USE_RESULT MaybeObject* SetLocalPropertyIgnoreAttributes(
String* key,
Object* value,
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
0c15f60f30677bc02c172b4f6929e5ac559273cd..ad2ccc3960857d7bc6191b48613e1b5dd6f5e451
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -3782,7 +3782,7 @@ MaybeObject*
Runtime::SetObjectProperty(Handle<Object> object,
Handle<Object> key,
Handle<Object> value,
PropertyAttributes attr,
- StrictModeFlag strict) {
+ StrictModeFlag strict_mode) {
HandleScope scope;
if (object->IsUndefined() || object->IsNull()) {
@@ -3825,7 +3825,7 @@ MaybeObject*
Runtime::SetObjectProperty(Handle<Object> object,
} else {
Handle<String> key_string = Handle<String>::cast(key);
key_string->TryFlatten();
- result = SetProperty(js_object, key_string, value, attr, strict);
+ result = SetProperty(js_object, key_string, value, attr,
strict_mode);
}
if (result.is_null()) return Failure::Exception();
return *value;
@@ -3841,7 +3841,7 @@ MaybeObject*
Runtime::SetObjectProperty(Handle<Object> object,
// TODO(1220): Implement SetElement strict mode.
return js_object->SetElement(index, *value);
} else {
- return js_object->SetProperty(*name, *value, attr, strict);
+ return js_object->SetProperty(*name, *value, attr, strict_mode);
}
}
@@ -3945,15 +3945,19 @@ static MaybeObject* Runtime_SetProperty(Arguments
args) {
PropertyAttributes attributes =
static_cast<PropertyAttributes>(unchecked_attributes);
- StrictModeFlag strict = kNonStrictMode;
+ StrictModeFlag strict_mode = kNonStrictMode;
if (args.length() == 5) {
CONVERT_SMI_CHECKED(strict_unchecked, args[4]);
RUNTIME_ASSERT(strict_unchecked == kStrictMode ||
strict_unchecked == kNonStrictMode);
- strict = static_cast<StrictModeFlag>(strict_unchecked);
+ strict_mode = static_cast<StrictModeFlag>(strict_unchecked);
}
- return Runtime::SetObjectProperty(object, key, value, attributes,
strict);
+ return Runtime::SetObjectProperty(object,
+ key,
+ value,
+ attributes,
+ strict_mode);
}
@@ -7543,8 +7547,7 @@ static MaybeObject*
Runtime_StoreContextSlot(Arguments args) {
CONVERT_SMI_CHECKED(strict_unchecked, args[3]);
RUNTIME_ASSERT(strict_unchecked == kStrictMode ||
strict_unchecked == kNonStrictMode);
- StrictModeFlag strict = static_cast<StrictModeFlag>(strict_unchecked);
-
+ StrictModeFlag strict_mode =
static_cast<StrictModeFlag>(strict_unchecked);
int index;
PropertyAttributes attributes;
@@ -7588,11 +7591,12 @@ static MaybeObject*
Runtime_StoreContextSlot(Arguments args) {
// extension object itself.
if ((attributes & READ_ONLY) == 0 ||
(context_ext->GetLocalPropertyAttribute(*name) == ABSENT)) {
- RETURN_IF_EMPTY_HANDLE(SetProperty(context_ext, name, value, NONE,
strict));
- } else if (strict == kStrictMode && (attributes & READ_ONLY) != 0) {
+ RETURN_IF_EMPTY_HANDLE(
+ SetProperty(context_ext, name, value, NONE, strict_mode));
+ } else if (strict_mode == kStrictMode && (attributes & READ_ONLY) != 0) {
// Setting read only property in strict mode.
Handle<Object> error =
- Factory::NewTypeError("strict_cannot_assign", HandleVector(&name,
1));
+ Factory::NewTypeError("strict_cannot_assign", HandleVector(&name,
1));
return Top::Throw(*error);
}
return *value;
Index: src/runtime.h
diff --git a/src/runtime.h b/src/runtime.h
index
9dd6eda0a9d3b4125cb9fb9fecbe4e43136bca9f..8e73d5c4a23bf5ab21c32644800bf7715f7cbd6b
100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -553,7 +553,7 @@ class Runtime : public AllStatic {
Handle<Object> key,
Handle<Object> value,
PropertyAttributes attr,
- StrictModeFlag strict);
+ StrictModeFlag strict_mode);
MUST_USE_RESULT static MaybeObject* ForceSetObjectProperty(
Handle<JSObject> object,
Index: src/stub-cache.cc
diff --git a/src/stub-cache.cc b/src/stub-cache.cc
index
360f0b743ebebaa99bd51325cc1840992601e62f..f23f3825ca987a9d24fd3145953c3231ac9e82ed
100644
--- a/src/stub-cache.cc
+++ b/src/stub-cache.cc
@@ -1429,13 +1429,13 @@ MaybeObject* StoreInterceptorProperty(Arguments
args) {
JSObject* recv = JSObject::cast(args[0]);
String* name = String::cast(args[1]);
Object* value = args[2];
- StrictModeFlag strict =
+ StrictModeFlag strict_mode =
static_cast<StrictModeFlag>(Smi::cast(args[3])->value());
- ASSERT(strict == kStrictMode || strict == kNonStrictMode);
+ ASSERT(strict_mode == kStrictMode || strict_mode == kNonStrictMode);
ASSERT(recv->HasNamedInterceptor());
PropertyAttributes attr = NONE;
MaybeObject* result = recv->SetPropertyWithInterceptor(
- name, value, attr, strict);
+ name, value, attr, strict_mode);
return result;
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
