diff --git a/include/v8.h b/include/v8.h index f23567c1429a..f2e12dcfd68e 100644 --- a/include/v8.h +++ b/include/v8.h @@ -996,6 +996,10 @@ class V8_EXPORT PrimitiveArray { public: static Local New(Isolate* isolate, int length); int Length() const; + V8_DEPRECATED("Use Isolate* version", + void Set(int index, Local item)); + V8_DEPRECATED("Use Isolate* version", + Local Get(int index)); void Set(Isolate* isolate, int index, Local item); Local Get(Isolate* isolate, int index); }; @@ -1699,6 +1703,8 @@ class V8_EXPORT StackTrace { /** * Returns a StackFrame at a particular index. */ + V8_DEPRECATED("Use Isolate version", + Local GetFrame(uint32_t index) const); Local GetFrame(Isolate* isolate, uint32_t index) const; /** @@ -2407,6 +2413,13 @@ class V8_EXPORT Value : public Data { V8_DEPRECATE_SOON("Use maybe version", Local ToInt32(Isolate* isolate) const); + inline V8_DEPRECATED("Use maybe version", + Local ToBoolean() const); + inline V8_DEPRECATED("Use maybe version", Local ToString() const); + inline V8_DEPRECATED("Use maybe version", Local ToObject() const); + inline V8_DEPRECATED("Use maybe version", + Local ToInteger() const); + /** * Attempts to convert a string to an array index. * Returns an empty handle if the conversion fails. @@ -2426,7 +2439,14 @@ class V8_EXPORT Value : public Data { Local context) const; V8_WARN_UNUSED_RESULT Maybe Int32Value(Local context) const; + V8_DEPRECATED("Use maybe version", bool BooleanValue() const); + V8_DEPRECATED("Use maybe version", double NumberValue() const); + V8_DEPRECATED("Use maybe version", int64_t IntegerValue() const); + V8_DEPRECATED("Use maybe version", uint32_t Uint32Value() const); + V8_DEPRECATED("Use maybe version", int32_t Int32Value() const); + /** JS == */ + V8_DEPRECATED("Use maybe version", bool Equals(Local that) const); V8_WARN_UNUSED_RESULT Maybe Equals(Local context, Local that) const; bool StrictEquals(Local that) const; @@ -2533,6 +2553,8 @@ class V8_EXPORT String : public Name { * Returns the number of bytes in the UTF-8 encoded * representation of this string. */ + V8_DEPRECATED("Use Isolate version instead", int Utf8Length() const); + int Utf8Length(Isolate* isolate) const; /** @@ -2589,12 +2611,23 @@ class V8_EXPORT String : public Name { // 16-bit character codes. int Write(Isolate* isolate, uint16_t* buffer, int start = 0, int length = -1, int options = NO_OPTIONS) const; + V8_DEPRECATED("Use Isolate* version", + int Write(uint16_t* buffer, int start = 0, int length = -1, + int options = NO_OPTIONS) const); // One byte characters. int WriteOneByte(Isolate* isolate, uint8_t* buffer, int start = 0, int length = -1, int options = NO_OPTIONS) const; + V8_DEPRECATED("Use Isolate* version", + int WriteOneByte(uint8_t* buffer, int start = 0, + int length = -1, int options = NO_OPTIONS) + const); // UTF-8 encoded characters. int WriteUtf8(Isolate* isolate, char* buffer, int length = -1, int* nchars_ref = nullptr, int options = NO_OPTIONS) const; + V8_DEPRECATED("Use Isolate* version", + int WriteUtf8(char* buffer, int length = -1, + int* nchars_ref = nullptr, + int options = NO_OPTIONS) const); /** * A zero length string. @@ -2786,6 +2819,9 @@ class V8_EXPORT String : public Name { */ static Local Concat(Isolate* isolate, Local left, Local right); + static V8_DEPRECATED("Use Isolate* version", + Local Concat(Local left, + Local right)); /** * Creates a new external string using the data defined in the given @@ -2854,6 +2890,8 @@ class V8_EXPORT String : public Name { */ class V8_EXPORT Utf8Value { public: + V8_DEPRECATED("Use Isolate version", + explicit Utf8Value(Local obj)); Utf8Value(Isolate* isolate, Local obj); ~Utf8Value(); char* operator*() { return str_; } @@ -2877,6 +2915,7 @@ class V8_EXPORT String : public Name { */ class V8_EXPORT Value { public: + V8_DEPRECATED("Use Isolate version", explicit Value(Local obj)); Value(Isolate* isolate, Local obj); ~Value(); uint16_t* operator*() { return str_; } @@ -5271,6 +5310,8 @@ class V8_EXPORT BooleanObject : public Object { class V8_EXPORT StringObject : public Object { public: static Local New(Isolate* isolate, Local value); + V8_DEPRECATED("Use Isolate* version", + static Local New(Local value)); Local ValueOf() const; @@ -10127,6 +10168,30 @@ template Value* Value::Cast(T* value) { } +Local Value::ToBoolean() const { + return ToBoolean(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(Local()); +} + + +Local Value::ToString() const { + return ToString(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(Local()); +} + + +Local Value::ToObject() const { + return ToObject(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(Local()); +} + + +Local Value::ToInteger() const { + return ToInteger(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(Local()); +} + + Boolean* Boolean::Cast(v8::Value* value) { #ifdef V8_ENABLE_CHECKS CheckCast(value); diff --git a/src/api.cc b/src/api.cc index 4000a95a2e52..ed4113a3381f 100644 --- a/src/api.cc +++ b/src/api.cc @@ -2181,6 +2181,10 @@ int PrimitiveArray::Length() const { return array->length(); } +void PrimitiveArray::Set(int index, Local item) { + return Set(Isolate::GetCurrent(), index, item); +} + void PrimitiveArray::Set(Isolate* v8_isolate, int index, Local item) { i::Isolate* isolate = reinterpret_cast(v8_isolate); @@ -2194,6 +2198,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index, array->set(index, *i_item); } +Local PrimitiveArray::Get(int index) { + return Get(Isolate::GetCurrent(), index); +} + Local PrimitiveArray::Get(Isolate* v8_isolate, int index) { i::Isolate* isolate = reinterpret_cast(v8_isolate); i::Handle array = Utils::OpenHandle(this); @@ -2899,6 +2907,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) { // --- S t a c k T r a c e --- +Local StackTrace::GetFrame(uint32_t index) const { + return GetFrame(Isolate::GetCurrent(), index); +} + Local StackTrace::GetFrame(Isolate* v8_isolate, uint32_t index) const { i::Isolate* isolate = reinterpret_cast(v8_isolate); @@ -3858,6 +3870,36 @@ void v8::RegExp::CheckCast(v8::Value* that) { } +bool Value::BooleanValue() const { + return BooleanValue(Isolate::GetCurrent()->GetCurrentContext()) + .FromJust(); +} + + +double Value::NumberValue() const { + return NumberValue(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(std::numeric_limits::quiet_NaN()); +} + + +int64_t Value::IntegerValue() const { + return NumberValue(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(0); +} + + +uint32_t Value::Uint32Value() const { + return Uint32Value(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(0); +} + + +int32_t Value::Int32Value() const { + return Int32Value(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(0); +} + + Maybe Value::BooleanValue(Local context) const { i::Isolate* isolate = reinterpret_cast(context->GetIsolate()); return Just(Utils::OpenHandle(this)->BooleanValue(isolate)); @@ -3946,6 +3988,12 @@ MaybeLocal Value::ToArrayIndex(Local context) const { } +bool Value::Equals(Local that) const { + return Equals(Isolate::GetCurrent()->GetCurrentContext(), that) + .FromMaybe(false); +} + + Maybe Value::Equals(Local context, Local that) const { i::Isolate* isolate = Utils::OpenHandle(*context)->GetIsolate(); auto self = Utils::OpenHandle(this); @@ -5269,6 +5317,10 @@ bool String::ContainsOnlyOneByte() const { return helper.Check(*str); } +int String::Utf8Length() const { + return Utf8Length(Isolate::GetCurrent()); +} + int String::Utf8Length(Isolate* isolate) const { i::Handle str = Utils::OpenHandle(this); str = i::String::Flatten(reinterpret_cast(isolate), str); @@ -5421,6 +5473,14 @@ static int WriteUtf8Impl(i::Vector string, char* write_start, } } // anonymous namespace + +int String::WriteUtf8(char* buffer, int capacity, + int* nchars_ref, int options) const { + return WriteUtf8(Isolate::GetCurrent(), + buffer, capacity, nchars_ref, options); +} + + int String::WriteUtf8(Isolate* v8_isolate, char* buffer, int capacity, int* nchars_ref, int options) const { i::Handle str = Utils::OpenHandle(this); @@ -5461,6 +5521,18 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string, } +int String::WriteOneByte(uint8_t* buffer, int start, + int length, int options) const { + return WriteOneByte(Isolate::GetCurrent(), buffer, start, length, options); +} + + +int String::Write(uint16_t* buffer, int start, int length, + int options) const { + return Write(Isolate::GetCurrent(), buffer, start, length, options); +} + + int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start, int length, int options) const { return WriteHelper(reinterpret_cast(isolate), this, buffer, @@ -6430,6 +6502,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, return result; } +Local v8::String::Concat(Local left, + Local right) { + return Concat(Isolate::GetCurrent(), left, right); +} + Local v8::String::Concat(Isolate* v8_isolate, Local left, Local right) { i::Isolate* isolate = reinterpret_cast(v8_isolate); @@ -6713,6 +6790,11 @@ bool v8::BooleanObject::ValueOf() const { } +Local v8::StringObject::New(Local value) { + return New(Isolate::GetCurrent(), value); +} + + Local v8::StringObject::New(Isolate* v8_isolate, Local value) { i::Handle string = Utils::OpenHandle(*value); @@ -8925,6 +9007,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8Isolate) { return isolate->default_microtask_queue()->IsRunningMicrotasks(); } +String::Utf8Value::Utf8Value(v8::Local obj) + : Utf8Value(Isolate::GetCurrent(), obj) {} + String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) : str_(nullptr), length_(0) { if (obj.IsEmpty()) return; @@ -8944,6 +9029,9 @@ String::Utf8Value::~Utf8Value() { i::DeleteArray(str_); } +String::Value::Value(v8::Local obj) + : Value(Isolate::GetCurrent(), obj) {} + String::Value::Value(v8::Isolate* isolate, v8::Local obj) : str_(nullptr), length_(0) { if (obj.IsEmpty()) return;