resume debug code object print at startup

yodalee · yodalee · commit 2b2839015351 · 2018-07-19T21:33:09.000+08:00
Impl more detail debug message for pyobject kind
diff --git a/src/main.rs b/src/main.rs
@@ -47,7 +47,7 @@ fn run_script(script_file: &String) {
     match parser::read_file(filepath) {
         Ok(source) => {
             let code_obj = compile::compile(&mut vm, &source, compile::Mode::Exec).unwrap();
-            debug!("Code object: {:?}", code_obj);
+            debug!("Code object: {:?}", code_obj.borrow());
             let vars = vm.new_dict(); // Keep track of local variables
             vm.run_code_obj(code_obj, vars);
         }
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -182,7 +182,6 @@ impl fmt::Debug for PyObject {
 
 type RustPyFunc = fn(rt: &mut Executor, Vec<PyObjectRef>) -> PyResult;
 
-// #[derive(Debug)]
 pub enum PyObjectKind {
     String {
         value: String,
@@ -241,8 +240,22 @@ pub enum PyObjectKind {
 impl fmt::Debug for PyObjectKind {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            &PyObjectKind::String { ref value } => write!(f, "str[{}]", value),
-            _ => write!(f, "Some kind of python obj"),
+            &PyObjectKind::String { ref value } => write!(f, "str \"{}\"", value),
+            &PyObjectKind::Integer { ref value } => write!(f, "int {}", value),
+            &PyObjectKind::Float { ref value } => write!(f, "float {}", value),
+            &PyObjectKind::Boolean { ref value } => write!(f, "boolean {}", value),
+            &PyObjectKind::List { ref elements } => write!(f, "list"),
+            &PyObjectKind::Tuple { ref elements } => write!(f, "tuple"),
+            &PyObjectKind::Dict { ref elements } => write!(f, "dict"),
+            &PyObjectKind::Iterator { ref position, ref iterated_obj } => write!(f, "iterator"),
+            &PyObjectKind::Slice { ref start, ref stop, ref step } => write!(f, "slice"),
+            &PyObjectKind::NameError { ref name } => write!(f, "NameError"),
+            &PyObjectKind::Code { ref code } => write!(f, "code: {:?}", code),
+            &PyObjectKind::Function { ref code } => write!(f, "function"),
+            &PyObjectKind::Module { ref name, ref dict } => write!(f, "module"),
+            &PyObjectKind::None => write!(f, "None"),
+            &PyObjectKind::Class { ref name } => write!(f, "class"),
+            &PyObjectKind::RustFunction { ref function } => write!(f, "rust function"),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ fn run_script(script_file: &String) {`
`47`	`47`	`match parser::read_file(filepath) {`
`48`	`48`	`Ok(source) => {`
`49`	`49`	`let code_obj = compile::compile(&mut vm, &source, compile::Mode::Exec).unwrap();`
`50`		`- debug!("Code object: {:?}", code_obj);`
	`50`	`+ debug!("Code object: {:?}", code_obj.borrow());`
`51`	`51`	`let vars = vm.new_dict(); // Keep track of local variables`
`52`	`52`	`vm.run_code_obj(code_obj, vars);`
`53`	`53`	`}`