Remove ProgramKind

Author: prozacchiwawa

wasm/src/dbg/obj.rs

@@ -32,7 +32,7 @@ use clvm_tools_rs::compiler::srcloc::Srcloc;
 use clvmr::Allocator;
 
 use crate::dbg::source::{find_location, lines_from_bytes, StoredScope};
-use crate::dbg::types::{DebuggerInputs, DebuggerSourceAndContent, ProgramKind};
+use crate::dbg::types::{DebuggerInputs, DebuggerSourceAndContent};
 #[cfg(test)]
 use crate::interfaces::EPrintWriter;
 use crate::interfaces::{IFileReader, ILogWriter};
@@ -630,7 +630,7 @@ pub fn read_program_data(
             frontend(opts.clone(), &source_and_content.source_parsed).map_err(compile_err_map)?;
 
         inputs.source = Some(source_and_content);
-        inputs.compiled = Ok(ProgramKind::FromModern(frontend_compiled));
+        inputs.compiled = Ok(Some(frontend_compiled));
     }
 
     let mut parsed_program = if inputs.is_hex {
@@ -698,9 +698,8 @@ pub fn read_program_data(
 
     let compiled = match &inputs.compiled {
         Err(_) => None,
-        Ok(ProgramKind::FromHex(_sexp)) => None,
-        Ok(ProgramKind::FromClassic(_node)) => None,
-        Ok(ProgramKind::FromModern(cf)) => {
+        Ok(None) => None,
+        Ok(Some(cf)) => {
             populate_arguments(fs.clone(), &mut use_symbol_table, cf);
             Some(cf.clone())
         }

wasm/src/dbg/types.rs

@@ -1,8 +1,6 @@
 use std::collections::HashMap;
 use std::rc::Rc;
 
-use clvmr::NodePtr;
-
 use clvm_tools_rs::classic::clvm_tools::comp_input::RunAndCompileInputData;
 use clvm_tools_rs::compiler::comptypes::CompileForm;
 use clvm_tools_rs::compiler::sexp::SExp;
@@ -18,19 +16,12 @@ pub struct DebuggerSourceAndContent {
     pub source_parsed: Vec<Rc<SExp>>,
 }
 
-#[allow(dead_code)]
-pub enum ProgramKind {
-    FromHex(Rc<SExp>),
-    FromClassic(NodePtr),
-    FromModern(CompileForm),
-}
-
 pub struct DebuggerInputs {
     pub is_hex: bool,
     pub source: Option<DebuggerSourceAndContent>,
     pub compile_input: Option<RunAndCompileInputData>,
     pub symbols: Option<DebuggerSymbols>,
-    pub compiled: Result<ProgramKind, String>,
+    pub compiled: Result<Option<CompileForm>, String>,
 }
 
 pub trait MessageHandler<M> {