refactor(tazjin/rlox): Move entrypoints into interpreters r/2123

Right now this introduces a simple mechanism to flip between the
interpreters.

Change-Id: I92ee920c53d76ab6b664ac671993a6d6426af61a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2412
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI

1 files changed, 7 insertions, 3 deletions

diff --git a/users/tazjin/rlox/src/treewalk/interpreter.rs b/users/tazjin/rlox/src/treewalk/interpreter.rs
index 32822d72face..5b47dc0248f9 100644
--- a/users/tazjin/rlox/src/treewalk/interpreter.rs
+++ b/users/tazjin/rlox/src/treewalk/interpreter.rs
@@ -1,7 +1,7 @@
 use crate::errors::{Error, ErrorKind};
 use crate::parser::{self, Block, Expr, Literal, Statement};
-use crate::treewalk::resolver;
 use crate::scanner::{self, TokenKind};
+use crate::treewalk::resolver;
 use std::collections::HashMap;
 use std::rc::Rc;
 use std::sync::RwLock;
@@ -223,9 +223,13 @@ impl Interpreter {
 
     // Interpreter itself
     pub fn interpret(&mut self, mut program: Block) -> Result<Value, Error> {
-        let globals = self.env.read()
+        let globals = self
+            .env
+            .read()
             .expect("static globals lock poisoned")
-            .values.keys().map(Clone::clone)
+            .values
+            .keys()
+            .map(Clone::clone)
             .collect::<Vec<String>>();
 
         resolver::resolve(&globals, &mut program)?;