summaryrefslogtreecommitdiff
path: root/cli/ops/repl.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/ops/repl.rs')
-rw-r--r--cli/ops/repl.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs
index 6fcae11fe..5ad79c22a 100644
--- a/cli/ops/repl.rs
+++ b/cli/ops/repl.rs
@@ -9,8 +9,8 @@ use std::sync::Arc;
use std::sync::Mutex;
pub fn init(i: &mut Isolate, s: &State) {
- i.register_op("op_repl_start", s.stateful_json_op(op_repl_start));
- i.register_op("op_repl_readline", s.stateful_json_op(op_repl_readline));
+ i.register_op("op_repl_start", s.stateful_json_op2(op_repl_start));
+ i.register_op("op_repl_readline", s.stateful_json_op2(op_repl_readline));
}
struct ReplResource(Arc<Mutex<Repl>>);
@@ -22,19 +22,19 @@ struct ReplStartArgs {
}
fn op_repl_start(
+ isolate: &mut deno_core::Isolate,
state: &State,
args: Value,
_zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, OpError> {
let args: ReplStartArgs = serde_json::from_value(args)?;
-
debug!("op_repl_start {}", args.history_file);
let history_path =
repl::history_path(&state.borrow().global_state.dir, &args.history_file);
let repl = repl::Repl::new(history_path);
- let mut state = state.borrow_mut();
let resource = ReplResource(Arc::new(Mutex::new(repl)));
- let rid = state.resource_table.add("repl", Box::new(resource));
+ let mut resource_table = isolate.resource_table.borrow_mut();
+ let rid = resource_table.add("repl", Box::new(resource));
Ok(JsonOp::Sync(json!(rid)))
}
@@ -45,7 +45,8 @@ struct ReplReadlineArgs {
}
fn op_repl_readline(
- state: &State,
+ isolate: &mut deno_core::Isolate,
+ _state: &State,
args: Value,
_zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, OpError> {
@@ -53,9 +54,8 @@ fn op_repl_readline(
let rid = args.rid as u32;
let prompt = args.prompt;
debug!("op_repl_readline {} {}", rid, prompt);
- let state = state.borrow();
- let resource = state
- .resource_table
+ let resource_table = isolate.resource_table.borrow();
+ let resource = resource_table
.get::<ReplResource>(rid)
.ok_or_else(OpError::bad_resource_id)?;
let repl = resource.0.clone();