Add some base exceptions

windelbouwman · windelbouwman · commit f76472c00b7f · 2018-08-24T23:36:26.000+02:00
diff --git a/tests/snippets/try_exceptions.py b/tests/snippets/try_exceptions.py
@@ -7,3 +7,18 @@
     print(type(ex))
     # print(ex.__traceback__)
     # print(type(ex.__traceback__))
+
+
+try:
+    assert 0
+except:
+    print('boom')
+finally:
+    print('kablam')
+
+try:
+    assert 0
+except AssertionError as ex:
+    print('boom', type(ex))
+finally:
+    print('kablam')
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -354,10 +354,26 @@ pub fn make_module(ctx: &PyContext) -> PyObjectRef {
     dict.insert(String::from("tuple"), ctx.tuple_type.clone());
     dict.insert(String::from("type"), ctx.type_type.clone());
     dict.insert(String::from("object"), ctx.object.clone());
+
+    // Exceptions:
     dict.insert(
         String::from("BaseException"),
         ctx.base_exception_type.clone(),
     );
+    let exception_type = ctx.new_class(&String::from("Exception"), ctx.base_exception_type.clone());
+    dict.insert(String::from("Exception"), exception_type.clone());
+    let assertion_error = ctx.new_class(&String::from("AssertionError"), exception_type.clone());
+    dict.insert(String::from("AssertionError"), assertion_error);
+    let attribute_error = ctx.new_class(&String::from("AttributeError"), exception_type.clone());
+    dict.insert(String::from("AttributeError"), attribute_error);
+    let name_error = ctx.new_class(&String::from("NameError"), exception_type.clone());
+    dict.insert(String::from("NameError"), name_error);
+    let runtime_error = ctx.new_class(&String::from("RuntimeError"), exception_type.clone());
+    dict.insert(String::from("RuntimeError"), runtime_error.clone());
+    let not_implemented_error =
+        ctx.new_class(&String::from("NotImplementedError"), runtime_error.clone());
+    dict.insert(String::from("NotImplementedError"), not_implemented_error);
+
     let d2 = PyObject::new(PyObjectKind::Dict { elements: dict }, ctx.type_type.clone());
     let scope = PyObject::new(
         PyObjectKind::Scope {
diff --git a/vm/src/compile.rs b/vm/src/compile.rs
@@ -423,6 +423,7 @@ impl Compiler {
                         self.emit(Instruction::CallFunction { count: 0 });
                     }
                 }
+                self.emit(Instruction::Raise { argc: 1 });
                 self.set_label(end_label);
             }
             ast::Statement::Break => {
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -23,6 +23,7 @@ mod objstr;
 mod objtype;
 pub mod pyobject;
 mod sysmodule;
+mod traceback;
 mod vm;
 
 // pub use self::pyobject::Executor;
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -194,6 +194,10 @@ impl PyContext {
         )
     }
 
+    pub fn new_class(&self, name: &String, base: PyObjectRef) -> PyObjectRef {
+        objtype::new(self.type_type.clone(), name, vec![base], self.new_dict()).unwrap()
+    }
+
     pub fn new_scope(&self, parent: Option<PyObjectRef>) -> PyObjectRef {
         let locals = self.new_dict();
         let scope = Scope {
diff --git a/vm/src/traceback.rs b/vm/src/traceback.rs
@@ -0,0 +1,2 @@
+// python tracebacks
+//

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,7 @@ impl Compiler {`
`423`	`423`	`self.emit(Instruction::CallFunction { count: 0 });`
`424`	`424`	`}`
`425`	`425`	`}`
	`426`	`+ self.emit(Instruction::Raise { argc: 1 });`
`426`	`427`	`self.set_label(end_label);`
`427`	`428`	`}`
`428`	`429`	`ast::Statement::Break => {`
Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,10 @@ impl PyContext {`
`194`	`194`	`)`
`195`	`195`	`}`
`196`	`196`
	`197`	`+ pub fn new_class(&self, name: &String, base: PyObjectRef) -> PyObjectRef {`
	`198`	`+ objtype::new(self.type_type.clone(), name, vec![base], self.new_dict()).unwrap()`
	`199`	`+ }`
	`200`	`+`
`197`	`201`	`pub fn new_scope(&self, parent: Option<PyObjectRef>) -> PyObjectRef {`
`198`	`202`	`let locals = self.new_dict();`
`199`	`203`	`let scope = Scope {`