summaryrefslogtreecommitdiff
path: root/core/bindings.rs
diff options
context:
space:
mode:
Diffstat (limited to 'core/bindings.rs')
-rw-r--r--core/bindings.rs92
1 files changed, 46 insertions, 46 deletions
diff --git a/core/bindings.rs b/core/bindings.rs
index d34dfe834..25272af84 100644
--- a/core/bindings.rs
+++ b/core/bindings.rs
@@ -1,7 +1,7 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
use crate::es_isolate::EsIsolate;
-use crate::isolate::Isolate;
+use crate::isolate::CoreIsolate;
use crate::isolate::ZeroCopyBuf;
use crate::js_errors::JSError;
@@ -251,7 +251,7 @@ pub extern "C" fn host_import_module_dynamically_callback(
let mut hs = v8::EscapableHandleScope::new(cbs.enter());
let scope = hs.enter();
let isolate = scope.isolate();
- let deno_isolate: &mut EsIsolate =
+ let core_isolate: &mut EsIsolate =
unsafe { &mut *(isolate.get_data(1) as *mut EsIsolate) };
// NOTE(bartlomieju): will crash for non-UTF-8 specifier
@@ -277,13 +277,13 @@ pub extern "C" fn host_import_module_dynamically_callback(
let mut resolver_handle = v8::Global::new();
resolver_handle.set(scope, resolver);
- let import_id = deno_isolate.next_dyn_import_id;
- deno_isolate.next_dyn_import_id += 1;
- deno_isolate
+ let import_id = core_isolate.next_dyn_import_id;
+ core_isolate.next_dyn_import_id += 1;
+ core_isolate
.dyn_import_map
.insert(import_id, resolver_handle);
- deno_isolate.dyn_import_cb(&specifier_str, &referrer_name_str, import_id);
+ core_isolate.dyn_import_cb(&specifier_str, &referrer_name_str, import_id);
&mut *scope.escape(promise)
}
@@ -297,13 +297,13 @@ pub extern "C" fn host_initialize_import_meta_object_callback(
let mut hs = v8::HandleScope::new(cbs.enter());
let scope = hs.enter();
let isolate = scope.isolate();
- let deno_isolate: &mut EsIsolate =
+ let core_isolate: &mut EsIsolate =
unsafe { &mut *(isolate.get_data(1) as *mut EsIsolate) };
let id = module.get_identity_hash();
assert_ne!(id, 0);
- let info = deno_isolate.modules.get_info(id).expect("Module not found");
+ let info = core_isolate.modules.get_info(id).expect("Module not found");
meta.create_data_property(
context,
@@ -322,10 +322,10 @@ pub extern "C" fn promise_reject_callback(message: v8::PromiseRejectMessage) {
let mut hs = v8::HandleScope::new(cbs.enter());
let scope = hs.enter();
- let deno_isolate: &mut Isolate =
- unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
+ let core_isolate: &mut CoreIsolate =
+ unsafe { &mut *(scope.isolate().get_data(0) as *mut CoreIsolate) };
- let context = deno_isolate.global_context.get(scope).unwrap();
+ let context = core_isolate.global_context.get(scope).unwrap();
let mut cs = v8::ContextScope::new(scope, context);
let scope = cs.enter();
@@ -337,13 +337,13 @@ pub extern "C" fn promise_reject_callback(message: v8::PromiseRejectMessage) {
let error = message.get_value();
let mut error_global = v8::Global::<v8::Value>::new();
error_global.set(scope, error);
- deno_isolate
+ core_isolate
.pending_promise_exceptions
.insert(promise_id, error_global);
}
v8::PromiseRejectEvent::PromiseHandlerAddedAfterReject => {
if let Some(mut handle) =
- deno_isolate.pending_promise_exceptions.remove(&promise_id)
+ core_isolate.pending_promise_exceptions.remove(&promise_id)
{
handle.reset(scope);
}
@@ -417,17 +417,17 @@ fn recv(
args: v8::FunctionCallbackArguments,
_rv: v8::ReturnValue,
) {
- let deno_isolate: &mut Isolate =
- unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
+ let core_isolate: &mut CoreIsolate =
+ unsafe { &mut *(scope.isolate().get_data(0) as *mut CoreIsolate) };
- if !deno_isolate.js_recv_cb.is_empty() {
+ if !core_isolate.js_recv_cb.is_empty() {
let msg = v8::String::new(scope, "Deno.core.recv already called.").unwrap();
scope.isolate().throw_exception(msg.into());
return;
}
let recv_fn = v8::Local::<v8::Function>::try_from(args.get(0)).unwrap();
- deno_isolate.js_recv_cb.set(scope, recv_fn);
+ core_isolate.js_recv_cb.set(scope, recv_fn);
}
fn send(
@@ -435,9 +435,9 @@ fn send(
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
- let deno_isolate: &mut Isolate =
- unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
- assert!(!deno_isolate.global_context.is_empty());
+ let core_isolate: &mut CoreIsolate =
+ unsafe { &mut *(scope.isolate().get_data(0) as *mut CoreIsolate) };
+ assert!(!core_isolate.global_context.is_empty());
let op_id = match v8::Local::<v8::Uint32>::try_from(args.get(0)) {
Ok(op_id) => op_id.value() as u32,
@@ -469,7 +469,7 @@ fn send(
// If response is empty then it's either async op or exception was thrown
let maybe_response =
- deno_isolate.dispatch_op(scope, op_id, control, zero_copy);
+ core_isolate.dispatch_op(scope, op_id, control, zero_copy);
if let Some(response) = maybe_response {
// Synchronous response.
@@ -488,10 +488,10 @@ fn set_macrotask_callback(
args: v8::FunctionCallbackArguments,
_rv: v8::ReturnValue,
) {
- let deno_isolate: &mut Isolate =
- unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
+ let core_isolate: &mut CoreIsolate =
+ unsafe { &mut *(scope.isolate().get_data(0) as *mut CoreIsolate) };
- if !deno_isolate.js_macrotask_cb.is_empty() {
+ if !core_isolate.js_macrotask_cb.is_empty() {
let msg =
v8::String::new(scope, "Deno.core.setMacrotaskCallback already called.")
.unwrap();
@@ -501,7 +501,7 @@ fn set_macrotask_callback(
let macrotask_cb_fn =
v8::Local::<v8::Function>::try_from(args.get(0)).unwrap();
- deno_isolate.js_macrotask_cb.set(scope, macrotask_cb_fn);
+ core_isolate.js_macrotask_cb.set(scope, macrotask_cb_fn);
}
fn eval_context(
@@ -509,10 +509,10 @@ fn eval_context(
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
- let deno_isolate: &mut Isolate =
- unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
- assert!(!deno_isolate.global_context.is_empty());
- let context = deno_isolate.global_context.get(scope).unwrap();
+ let core_isolate: &mut CoreIsolate =
+ unsafe { &mut *(scope.isolate().get_data(0) as *mut CoreIsolate) };
+ assert!(!core_isolate.global_context.is_empty());
+ let context = core_isolate.global_context.get(scope).unwrap();
let source = match v8::Local::<v8::String>::try_from(args.get(0)) {
Ok(s) => s,
@@ -645,10 +645,10 @@ fn format_error(
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
- let deno_isolate: &mut Isolate =
- unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
+ let core_isolate: &mut CoreIsolate =
+ unsafe { &mut *(scope.isolate().get_data(0) as *mut CoreIsolate) };
let e = JSError::from_v8_exception(scope, args.get(0));
- let e = (deno_isolate.js_error_create_fn)(e);
+ let e = (core_isolate.js_error_create_fn)(e);
let e = e.to_string();
let e = v8::String::new(scope, &e).unwrap();
rv.set(e.into())
@@ -736,19 +736,19 @@ fn shared_getter(
_args: v8::PropertyCallbackArguments,
mut rv: v8::ReturnValue,
) {
- let deno_isolate: &mut Isolate =
- unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
+ let core_isolate: &mut CoreIsolate =
+ unsafe { &mut *(scope.isolate().get_data(0) as *mut CoreIsolate) };
// Lazily initialize the persistent external ArrayBuffer.
- if deno_isolate.shared_ab.is_empty() {
+ if core_isolate.shared_ab.is_empty() {
let ab = v8::SharedArrayBuffer::with_backing_store(
scope,
- deno_isolate.shared.get_backing_store(),
+ core_isolate.shared.get_backing_store(),
);
- deno_isolate.shared_ab.set(scope, ab);
+ core_isolate.shared_ab.set(scope, ab);
}
- let shared_ab = deno_isolate.shared_ab.get(scope).unwrap();
+ let shared_ab = core_isolate.shared_ab.get(scope).unwrap();
rv.set(shared_ab.into());
}
@@ -761,11 +761,11 @@ pub fn module_resolve_callback<'s>(
let mut scope = v8::EscapableHandleScope::new(scope.enter());
let scope = scope.enter();
- let deno_isolate: &mut EsIsolate =
+ let core_isolate: &mut EsIsolate =
unsafe { &mut *(scope.isolate().get_data(1) as *mut EsIsolate) };
let referrer_id = referrer.get_identity_hash();
- let referrer_name = deno_isolate
+ let referrer_name = core_isolate
.modules
.get_info(referrer_id)
.expect("ModuleInfo not found")
@@ -780,8 +780,8 @@ pub fn module_resolve_callback<'s>(
let req_str = req.to_rust_string_lossy(scope);
if req_str == specifier_str {
- let id = deno_isolate.module_resolve_cb(&req_str, referrer_id);
- let maybe_info = deno_isolate.modules.get_info(id);
+ let id = core_isolate.module_resolve_cb(&req_str, referrer_id);
+ let maybe_info = core_isolate.modules.get_info(id);
if maybe_info.is_none() {
let msg = format!(
@@ -812,10 +812,10 @@ fn get_promise_details(
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
- let deno_isolate: &mut Isolate =
- unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
- assert!(!deno_isolate.global_context.is_empty());
- let context = deno_isolate.global_context.get(scope).unwrap();
+ let core_isolate: &mut CoreIsolate =
+ unsafe { &mut *(scope.isolate().get_data(0) as *mut CoreIsolate) };
+ assert!(!core_isolate.global_context.is_empty());
+ let context = core_isolate.global_context.get(scope).unwrap();
let promise = match v8::Local::<v8::Promise>::try_from(args.get(0)) {
Ok(val) => val,