WIP

argumentcomputer · Aug 9, 2023 · 985efe9 · 985efe9
1 parent 4b23a1b
commit 985efe9
Show file tree

Hide file tree

Showing 8 changed files with 236 additions and 202 deletions.
diff --git a/src/cli/repl.rs b/src/cli/repl.rs
@@ -780,7 +780,12 @@ impl Repl<F> {
         }
 
         loop {
-            match editor.readline("> ") {
+            match editor.readline(&format!(
+                "{}> ",
+                self.state
+                    .borrow()
+                    .fmt_to_string(self.state.borrow().get_current_package_name())
+            )) {
                 Ok(line) => {
                     #[cfg(not(target_arch = "wasm32"))]
                     editor.save_history(history_path)?;

diff --git a/src/lem/store.rs b/src/lem/store.rs
@@ -236,7 +236,7 @@ impl<F: LurkField> Store<F> {
             Syntax::Symbol(_, symbol) => Ok(self.intern_symbol(&symbol)),
             Syntax::String(_, x) => Ok(self.intern_string(&x)),
             Syntax::Quote(pos, x) => {
-                let xs = vec![Syntax::Symbol(pos, lurk_sym("quote")), *x];
+                let xs = vec![Syntax::Symbol(pos, lurk_sym("quote").into()), *x];
                 self.intern_syntax(Syntax::List(pos, xs))
             }
             Syntax::List(_, xs) => {

diff --git a/src/parser.rs b/src/parser.rs
@@ -32,8 +32,6 @@ pub enum Error {
     NoInput,
     #[error("Syntax error: {0}")]
     Syntax(String),
-    #[error("Interning error: {0}")]
-    Interning(String),
 }
 
 impl<F: LurkField> Store<F> {
@@ -42,10 +40,7 @@ impl<F: LurkField> Store<F> {
         match preceded(syntax::parse_space, syntax::parse_syntax(state, false))
             .parse(Span::new(input))
         {
-            Ok((_i, x)) => match self.intern_syntax(x) {
-                Ok(ptr) => Ok(ptr),
-                Err(e) => Err(Error::Interning(format!("{}", e))),
-            },
+            Ok((_i, x)) => Ok(self.intern_syntax(x)),
             Err(e) => Err(Error::Syntax(format!("{}", e))),
         }
     }
@@ -58,10 +53,7 @@ impl<F: LurkField> Store<F> {
         match preceded(syntax::parse_space, syntax::parse_syntax(state, false))
             .parse(Span::new(input))
         {
-            Ok((_i, x)) => match self.intern_syntax(x) {
-                Ok(ptr) => Ok(ptr),
-                Err(e) => Err(Error::Interning(format!("{}", e))),
-            },
+            Ok((_i, x)) => Ok(self.intern_syntax(x)),
             Err(e) => Err(Error::Syntax(format!("{}", e))),
         }
     }
@@ -73,10 +65,7 @@ impl<F: LurkField> Store<F> {
     ) -> Result<(Span<'a>, Ptr<F>, bool), Error> {
         use syntax::*;
         match preceded(parse_space, parse_maybe_meta(state)).parse(input) {
-            Ok((i, Some((is_meta, x)))) => match self.intern_syntax(x) {
-                Ok(ptr) => Ok((i, ptr, is_meta)),
-                Err(e) => Err(Error::Interning(format!("{}", e))),
-            },
+            Ok((i, Some((is_meta, x)))) => Ok((i, self.intern_syntax(x), is_meta)),
             Ok((_, None)) => Err(Error::NoInput),
             Err(e) => Err(Error::Syntax(format!("{}", e))),
         }