Debug stuff

schala-repl/src/language.rs

@@ -38,7 +38,7 @@ pub struct GlobalOutputStats {
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Deserialize, Serialize)]
 pub enum DebugAsk {
   Timing,
-  ByStage { stage_name: String },
+  ByStage { stage_name: String, token: Option<String> },
 }
 
 pub struct DebugResponse {

schala-repl/src/repl/directive_actions.rs

@@ -52,15 +52,12 @@ impl DirectiveAction {
           Some(s) => s.to_string(),
           None => return Some(format!("Must specify a thing to debug")),
         };
-        let meta = LangMetaRequest::ImmediateDebug(DebugAsk::ByStage { stage_name: stage_name.clone() });
+        let meta = LangMetaRequest::ImmediateDebug(DebugAsk::ByStage { stage_name: stage_name.clone(), token: None });
+        let meta_response = cur_state.request_meta(meta);
 
-        let response = match cur_state.request_meta(meta) {
-          LangMetaResponse::ImmediateDebug(DebugResponse { ask, value }) => {
-            if (ask != DebugAsk::ByStage { stage_name: stage_name }) {
-              return Some(format!("Didn't get debug stage requested"));
-            }
-            value
-          },
+        let response = match meta_response { 
+          LangMetaResponse::ImmediateDebug(DebugResponse { ask: DebugAsk::ByStage { stage_name: this_stage_name, .. }, value }) if this_stage_name == stage_name =>
+            value,
           _ => return Some(format!("Invalid language meta response")),
         };
         Some(response)
@@ -70,7 +67,7 @@ impl DirectiveAction {
           Some(s) => s.to_string(),
           None => return Some(format!("Must specify a stage to show")),
         };
-        let ask = DebugAsk::ByStage { stage_name };
+        let ask = DebugAsk::ByStage { stage_name, token: None };
         repl.options.debug_asks.insert(ask);
         None
       },
@@ -79,7 +76,7 @@ impl DirectiveAction {
           Some(s) => s.to_string(),
           None => return Some(format!("Must specify a stage to hide")),
         };
-        let ask = DebugAsk::ByStage { stage_name };
+        let ask = DebugAsk::ByStage { stage_name, token: None };
         repl.options.debug_asks.remove(&ask);
         None
       },

schala-repl/src/repl/mod.rs

@@ -149,7 +149,7 @@ impl Repl {
 
     for debug_resp in response.debug_responses {
       let stage_name = match debug_resp.ask {
-        DebugAsk::ByStage { stage_name } => stage_name,
+        DebugAsk::ByStage { stage_name, .. } => stage_name,
         _ => continue,
       };
       let s = format!("{} - {}\n", stage_name, debug_resp.value);