Add filename and row to traceback

windelbouwman · windelbouwman · commit 96ee1cce60e6 · 2018-08-26T12:17:16.000+02:00
diff --git a/parser/src/lexer.rs b/parser/src/lexer.rs
@@ -20,8 +20,8 @@ pub enum LexicalError {
 
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct Location {
-    row: usize,
-    column: usize,
+    pub row: usize,
+    pub column: usize,
 }
 
 impl Location {
diff --git a/src/main.rs b/src/main.rs
@@ -58,6 +58,7 @@ fn _run_string(source: &String, source_path: Option<String>) {
     match vm.run_code_obj(code_obj, vars) {
         Ok(_value) => {}
         Err(exc) => {
+            // println!("X: {:?}", exc.get_attr("__traceback__"));
             panic!("Exception: {:?}", exc);
         }
     }
diff --git a/vm/src/objlist.rs b/vm/src/objlist.rs
@@ -24,7 +24,7 @@ pub fn set_item(
     }
 }
 
-fn append(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+pub fn append(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     trace!("list.append called with: {:?}", args);
     if args.args.len() == 2 {
         let l = args.args[0].clone();
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -219,17 +219,21 @@ impl VirtualMachine {
             } else if scope.has_parent() {
                 scope = scope.get_parent();
             } else {
-                let name_error = self.context().new_instance(
-                    self.context().new_dict(),
-                    self.context().exceptions.name_error.clone(),
-                );
+                let name_error_type = self.ctx.exceptions.name_error.clone();
+                let msg = format!("Has not attribute '{}'", name);
+                let name_error = self.new_exception(name_error_type, msg);
                 break Some(Err(name_error));
             }
         }
     }
 
     fn run_frame(&mut self, frame: Frame) -> PyResult {
         self.frames.push(frame);
+        let filename = if let Some(source_path) = &self.current_frame().code.source_path {
+            source_path.to_string()
+        } else {
+            "<unknown>".to_string()
+        };
 
         // Execute until return or exception:
         let value = loop {
@@ -243,9 +247,24 @@ impl VirtualMachine {
                 Some(Err(exception)) => {
                     // unwind block stack on exception and find any handlers.
                     // Add an entry in the traceback:
-                    let traceback =
-                        self.get_attribute(exception.clone(), &"__traceback__".to_string());
+                    assert!(objtype::isinstance(
+                        exception.clone(),
+                        self.ctx.exceptions.base_exception_type.clone()
+                    ));
+                    let traceback = self
+                        .get_attribute(exception.clone(), &"__traceback__".to_string())
+                        .unwrap();
                     trace!("Adding to traceback: {:?} {:?}", traceback, lineno);
+                    let pos = self.ctx.new_tuple(vec![
+                        self.ctx.new_str(filename.clone()),
+                        self.ctx.new_int(lineno.row as i32),
+                    ]);
+                    objlist::append(
+                        self,
+                        PyFuncArgs {
+                            args: vec![traceback, pos],
+                        },
+                    ).unwrap();
                     // exception.__trace
                     match self.unwind_exception(exception) {
                         None => {}
@@ -901,7 +920,7 @@ impl VirtualMachine {
         current_frame.lasti = target_pc;
     }
 
-    fn get_lineno(&mut self) -> ast::Location {
+    fn get_lineno(&self) -> ast::Location {
         self.current_frame().get_lineno()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ pub enum LexicalError {`
`20`	`20`
`21`	`21`	`#[derive(Clone, Debug, Default, PartialEq)]`
`22`	`22`	`pub struct Location {`
`23`		`- row: usize,`
`24`		`- column: usize,`
	`23`	`+ pub row: usize,`
	`24`	`+ pub column: usize,`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`impl Location {`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ fn _run_string(source: &String, source_path: Option<String>) {`
`58`	`58`	`match vm.run_code_obj(code_obj, vars) {`
`59`	`59`	`Ok(_value) => {}`
`60`	`60`	`Err(exc) => {`
	`61`	`+ // println!("X: {:?}", exc.get_attr("__traceback__"));`
`61`	`62`	`panic!("Exception: {:?}", exc);`
`62`	`63`	`}`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ pub fn set_item(`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-fn append(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
	`27`	`+pub fn append(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`28`	`28`	`trace!("list.append called with: {:?}", args);`
`29`	`29`	`if args.args.len() == 2 {`
`30`	`30`	`let l = args.args[0].clone();`