Skip to content

Commit 2c87159

Browse files
caoccaocaoccao
committed
🐞 fix: Fix accidental break of RunTillNoMoreTasks
1 parent 9c9e021 commit 2c87159

File tree

5 files changed

+494
-495
lines changed

5 files changed

+494
-495
lines changed

‎cpp/jni/javet_jni_core_v8.cpp

+54-54
Original file line numberDiff line numberDiff line change
@@ -172,60 +172,60 @@ JNIEXPORT jboolean JNICALL Java_com_caoccao_javet_interop_V8Native_hasInternalTy
172172
using namespace Javet::Enums::V8ValueInternalType;
173173
switch (v8ValueInternalType)
174174
{
175-
case V8ValueInternalType::Undefined: return v8LocalValue->IsUndefined(); // 0
176-
case V8ValueInternalType::Null: return v8LocalValue->IsNull(); // 1
177-
case V8ValueInternalType::NullOrUndefined: return v8LocalValue->IsNullOrUndefined(); // 2
178-
case V8ValueInternalType::True: return v8LocalValue->IsTrue(); // 3
179-
case V8ValueInternalType::False: return v8LocalValue->IsFalse(); // 4
180-
case V8ValueInternalType::Name: return v8LocalValue->IsName(); // 5
181-
case V8ValueInternalType::String: return v8LocalValue->IsString(); // 6
182-
case V8ValueInternalType::Symbol: return v8LocalValue->IsSymbol(); // 7
183-
case V8ValueInternalType::Function: return v8LocalValue->IsFunction(); // 8
184-
case V8ValueInternalType::Array: return v8LocalValue->IsArray(); // 9
185-
case V8ValueInternalType::Object: return v8LocalValue->IsObject(); // 10
186-
case V8ValueInternalType::BigInt: return v8LocalValue->IsBigInt(); // 11
187-
case V8ValueInternalType::Boolean: return v8LocalValue->IsBoolean(); // 12
188-
case V8ValueInternalType::Number: return v8LocalValue->IsNumber(); // 13
189-
case V8ValueInternalType::External: return v8LocalValue->IsExternal(); // 14
190-
case V8ValueInternalType::Int32: return v8LocalValue->IsInt32(); // 15
191-
case V8ValueInternalType::Date: return v8LocalValue->IsDate(); // 16
192-
case V8ValueInternalType::ArgumentsObject: return v8LocalValue->IsArgumentsObject(); // 17
193-
case V8ValueInternalType::BigIntObject: return v8LocalValue->IsBigIntObject(); // 18
194-
case V8ValueInternalType::BooleanObject: return v8LocalValue->IsBooleanObject(); // 19
195-
case V8ValueInternalType::NumberObject: return v8LocalValue->IsNumberObject(); // 20
196-
case V8ValueInternalType::StringObject: return v8LocalValue->IsStringObject(); // 21
197-
case V8ValueInternalType::SymbolObject: return v8LocalValue->IsSymbolObject(); // 22
198-
case V8ValueInternalType::NativeError: return v8LocalValue->IsNativeError(); // 23
199-
case V8ValueInternalType::RegExp: return v8LocalValue->IsRegExp(); // 24
200-
case V8ValueInternalType::AsyncFunction: return v8LocalValue->IsAsyncFunction(); // 25
201-
case V8ValueInternalType::GeneratorFunction: return v8LocalValue->IsGeneratorFunction(); // 26
202-
case V8ValueInternalType::GeneratorObject: return v8LocalValue->IsGeneratorObject(); // 27
203-
case V8ValueInternalType::Promise: return v8LocalValue->IsPromise(); // 28
204-
case V8ValueInternalType::Map: return v8LocalValue->IsMap(); // 29
205-
case V8ValueInternalType::Set: return v8LocalValue->IsSet(); // 30
206-
case V8ValueInternalType::MapIterator: return v8LocalValue->IsMapIterator(); // 31
207-
case V8ValueInternalType::SetIterator: return v8LocalValue->IsSetIterator(); // 32
208-
case V8ValueInternalType::WeakMap: return v8LocalValue->IsWeakMap(); // 33
209-
case V8ValueInternalType::WeakSet: return v8LocalValue->IsWeakSet(); // 34
210-
case V8ValueInternalType::ArrayBuffer: return v8LocalValue->IsArrayBuffer(); // 35
211-
case V8ValueInternalType::ArrayBufferView: return v8LocalValue->IsArrayBufferView(); // 36
212-
case V8ValueInternalType::TypedArray: return v8LocalValue->IsTypedArray(); // 37
213-
case V8ValueInternalType::Uint8Array: return v8LocalValue->IsUint8Array(); // 38
214-
case V8ValueInternalType::Uint8ClampedArray: return v8LocalValue->IsUint8ClampedArray(); // 39
215-
case V8ValueInternalType::Int8Array: return v8LocalValue->IsInt8Array(); // 40
216-
case V8ValueInternalType::Uint16Array: return v8LocalValue->IsUint16Array(); // 41
217-
case V8ValueInternalType::Int16Array: return v8LocalValue->IsInt16Array(); // 42
218-
case V8ValueInternalType::Uint32Array: return v8LocalValue->IsUint32Array(); // 43
219-
case V8ValueInternalType::Int32Array: return v8LocalValue->IsInt32Array(); // 44
220-
case V8ValueInternalType::Float32Array: return v8LocalValue->IsFloat32Array(); // 45
221-
case V8ValueInternalType::Float64Array: return v8LocalValue->IsFloat64Array(); // 46
222-
case V8ValueInternalType::BigInt64Array: return v8LocalValue->IsBigInt64Array(); // 47
223-
case V8ValueInternalType::BigUint64Array: return v8LocalValue->IsBigUint64Array(); // 48
224-
case V8ValueInternalType::DataView: return v8LocalValue->IsDataView(); // 49
225-
case V8ValueInternalType::SharedArrayBuffer: return v8LocalValue->IsSharedArrayBuffer(); // 50
226-
case V8ValueInternalType::Proxy: return v8LocalValue->IsProxy(); // 51
227-
case V8ValueInternalType::WasmModuleObject: return v8LocalValue->IsWasmModuleObject(); // 52
228-
case V8ValueInternalType::ModuleNamespaceObject: return v8LocalValue->IsModuleNamespaceObject(); // 53
175+
case Undefined: return v8LocalValue->IsUndefined(); // 0
176+
case Null: return v8LocalValue->IsNull(); // 1
177+
case NullOrUndefined: return v8LocalValue->IsNullOrUndefined(); // 2
178+
case True: return v8LocalValue->IsTrue(); // 3
179+
case False: return v8LocalValue->IsFalse(); // 4
180+
case Name: return v8LocalValue->IsName(); // 5
181+
case String: return v8LocalValue->IsString(); // 6
182+
case Symbol: return v8LocalValue->IsSymbol(); // 7
183+
case Function: return v8LocalValue->IsFunction(); // 8
184+
case Array: return v8LocalValue->IsArray(); // 9
185+
case Object: return v8LocalValue->IsObject(); // 10
186+
case BigInt: return v8LocalValue->IsBigInt(); // 11
187+
case Boolean: return v8LocalValue->IsBoolean(); // 12
188+
case Number: return v8LocalValue->IsNumber(); // 13
189+
case External: return v8LocalValue->IsExternal(); // 14
190+
case Int32: return v8LocalValue->IsInt32(); // 15
191+
case Date: return v8LocalValue->IsDate(); // 16
192+
case ArgumentsObject: return v8LocalValue->IsArgumentsObject(); // 17
193+
case BigIntObject: return v8LocalValue->IsBigIntObject(); // 18
194+
case BooleanObject: return v8LocalValue->IsBooleanObject(); // 19
195+
case NumberObject: return v8LocalValue->IsNumberObject(); // 20
196+
case StringObject: return v8LocalValue->IsStringObject(); // 21
197+
case SymbolObject: return v8LocalValue->IsSymbolObject(); // 22
198+
case NativeError: return v8LocalValue->IsNativeError(); // 23
199+
case RegExp: return v8LocalValue->IsRegExp(); // 24
200+
case AsyncFunction: return v8LocalValue->IsAsyncFunction(); // 25
201+
case GeneratorFunction: return v8LocalValue->IsGeneratorFunction(); // 26
202+
case GeneratorObject: return v8LocalValue->IsGeneratorObject(); // 27
203+
case Promise: return v8LocalValue->IsPromise(); // 28
204+
case Map: return v8LocalValue->IsMap(); // 29
205+
case Set: return v8LocalValue->IsSet(); // 30
206+
case MapIterator: return v8LocalValue->IsMapIterator(); // 31
207+
case SetIterator: return v8LocalValue->IsSetIterator(); // 32
208+
case WeakMap: return v8LocalValue->IsWeakMap(); // 33
209+
case WeakSet: return v8LocalValue->IsWeakSet(); // 34
210+
case ArrayBuffer: return v8LocalValue->IsArrayBuffer(); // 35
211+
case ArrayBufferView: return v8LocalValue->IsArrayBufferView(); // 36
212+
case TypedArray: return v8LocalValue->IsTypedArray(); // 37
213+
case Uint8Array: return v8LocalValue->IsUint8Array(); // 38
214+
case Uint8ClampedArray: return v8LocalValue->IsUint8ClampedArray(); // 39
215+
case Int8Array: return v8LocalValue->IsInt8Array(); // 40
216+
case Uint16Array: return v8LocalValue->IsUint16Array(); // 41
217+
case Int16Array: return v8LocalValue->IsInt16Array(); // 42
218+
case Uint32Array: return v8LocalValue->IsUint32Array(); // 43
219+
case Int32Array: return v8LocalValue->IsInt32Array(); // 44
220+
case Float32Array: return v8LocalValue->IsFloat32Array(); // 45
221+
case Float64Array: return v8LocalValue->IsFloat64Array(); // 46
222+
case BigInt64Array: return v8LocalValue->IsBigInt64Array(); // 47
223+
case BigUint64Array: return v8LocalValue->IsBigUint64Array(); // 48
224+
case DataView: return v8LocalValue->IsDataView(); // 49
225+
case SharedArrayBuffer: return v8LocalValue->IsSharedArrayBuffer(); // 50
226+
case Proxy: return v8LocalValue->IsProxy(); // 51
227+
case WasmModuleObject: return v8LocalValue->IsWasmModuleObject(); // 52
228+
case ModuleNamespaceObject: return v8LocalValue->IsModuleNamespaceObject(); // 53
229229
default:
230230
break;
231231
}

‎cpp/jni/javet_jni_error.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ JNIEXPORT jobject JNICALL Java_com_caoccao_javet_interop_V8Native_errorCreate
2323
auto errorMessage = Javet::Converter::ToV8String(jniEnv, v8Context, mMessage);
2424
using namespace Javet::Enums::V8ValueErrorType;
2525
switch (mErrorTypeId) {
26-
case V8ValueErrorType::Error: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::Error(errorMessage));
27-
case V8ValueErrorType::RangeError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::RangeError(errorMessage));
28-
case V8ValueErrorType::ReferenceError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::ReferenceError(errorMessage));
29-
case V8ValueErrorType::SyntaxError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::SyntaxError(errorMessage));
30-
case V8ValueErrorType::TypeError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::TypeError(errorMessage));
31-
case V8ValueErrorType::WasmCompileError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::WasmCompileError(errorMessage));
32-
case V8ValueErrorType::WasmLinkError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::WasmLinkError(errorMessage));
33-
case V8ValueErrorType::WasmRuntimeError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::WasmRuntimeError(errorMessage));
26+
case Error: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::Error(errorMessage));
27+
case RangeError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::RangeError(errorMessage));
28+
case ReferenceError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::ReferenceError(errorMessage));
29+
case SyntaxError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::SyntaxError(errorMessage));
30+
case TypeError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::TypeError(errorMessage));
31+
case WasmCompileError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::WasmCompileError(errorMessage));
32+
case WasmLinkError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::WasmLinkError(errorMessage));
33+
case WasmRuntimeError: return v8Runtime->SafeToExternalV8Value(jniEnv, v8Context, v8::Exception::WasmRuntimeError(errorMessage));
3434
}
3535
return Javet::Converter::ToExternalV8ValueUndefined(jniEnv, v8Runtime);
3636
}
@@ -86,14 +86,14 @@ JNIEXPORT jboolean JNICALL Java_com_caoccao_javet_interop_V8Native_throwError__J
8686
V8LocalValue v8LocalValueError;
8787
using namespace Javet::Enums::V8ValueErrorType;
8888
switch (mErrorTypeId) {
89-
case V8ValueErrorType::Error: v8LocalValueError = v8::Exception::Error(errorMessage); break;
90-
case V8ValueErrorType::RangeError: v8LocalValueError = v8::Exception::RangeError(errorMessage); break;
91-
case V8ValueErrorType::ReferenceError: v8LocalValueError = v8::Exception::ReferenceError(errorMessage); break;
92-
case V8ValueErrorType::SyntaxError: v8LocalValueError = v8::Exception::SyntaxError(errorMessage); break;
93-
case V8ValueErrorType::TypeError: v8LocalValueError = v8::Exception::TypeError(errorMessage); break;
94-
case V8ValueErrorType::WasmCompileError: v8LocalValueError = v8::Exception::WasmCompileError(errorMessage); break;
95-
case V8ValueErrorType::WasmLinkError: v8LocalValueError = v8::Exception::WasmLinkError(errorMessage); break;
96-
case V8ValueErrorType::WasmRuntimeError: v8LocalValueError = v8::Exception::WasmRuntimeError(errorMessage); break;
89+
case Error: v8LocalValueError = v8::Exception::Error(errorMessage); break;
90+
case RangeError: v8LocalValueError = v8::Exception::RangeError(errorMessage); break;
91+
case ReferenceError: v8LocalValueError = v8::Exception::ReferenceError(errorMessage); break;
92+
case SyntaxError: v8LocalValueError = v8::Exception::SyntaxError(errorMessage); break;
93+
case TypeError: v8LocalValueError = v8::Exception::TypeError(errorMessage); break;
94+
case WasmCompileError: v8LocalValueError = v8::Exception::WasmCompileError(errorMessage); break;
95+
case WasmLinkError: v8LocalValueError = v8::Exception::WasmLinkError(errorMessage); break;
96+
case WasmRuntimeError: v8LocalValueError = v8::Exception::WasmRuntimeError(errorMessage); break;
9797
}
9898
if (!v8LocalValueError.IsEmpty()) {
9999
v8Context->GetIsolate()->ThrowException(v8LocalValueError);

‎cpp/jni/javet_jni_function.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -339,13 +339,13 @@ JNIEXPORT jint JNICALL Java_com_caoccao_javet_interop_V8Native_functionGetJSFunc
339339
auto v8InternalShared = *v8InternalFunction.shared();
340340
#endif
341341
if (v8InternalShared.native()) {
342-
return JSFunctionType::Native;
342+
return Native;
343343
}
344344
else if (v8InternalShared.IsApiFunction()) {
345-
return JSFunctionType::API;
345+
return API;
346346
}
347347
else if (v8InternalShared.IsUserJavaScript()) {
348-
return JSFunctionType::UserDefined;
348+
return UserDefined;
349349
}
350350
}
351351
return JSFunctionType::Unknown;

0 commit comments

Comments
 (0)