reorganize towards function execution

1 files changed, 2 insertions, 3 deletions

diff --git a/src/main.rs b/src/main.rs
index 1dd86bc..7223e26 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,7 +26,6 @@ use raw::*;
 
 use crate::cursor::{Direction, move_cursor};
 use crate::parse::{Ast, PreExpansion};
-use crate::run::CommandDispatch;
 
 macro_rules! print {
     ($($x:tt)*) => {{
@@ -62,8 +61,8 @@ pub struct Session {
     raw: ScopedRawMode,
     line: LineBuf,
     history: Vec<BString>,
-    dispatch: CommandDispatch,
     prev_path: BString,
+    builtins: HashMap<BString, &'static dyn run::Builtin>,
     vars: HashMap<BString, BString>,
     funs: HashMap<BString, Ast<PreExpansion>>,
 
@@ -203,7 +202,7 @@ fn event_loop() {
         raw,
         line: LineBuf::new(),
         history: Vec::new(),
-        dispatch: CommandDispatch::new(),
+        builtins: run::builtin_map(),
         prev_path: vec![b'.'],
         history_visit: 0,
         vars: HashMap::new(),