hongbo/upgrade

bool.mbt

@@ -1,14 +1,15 @@
 // ========================================
 // PyBool
 // ========================================
+
 ///|
 pub struct PyBool {
   priv obj : PyObject
 }
 
 ///| Create a python boolean object from a python object.
 /// If the object is not a boolean, it will raise a TypeMisMatchError.
-pub fn PyBool::create(obj : PyObject) -> PyBool!PyRuntimeError {
+pub fn PyBool::create(obj : PyObject) -> PyBool raise PyRuntimeError {
   guard obj.is_bool() else { raise TypeMisMatchError }
   PyBool::{ obj, }
 }
@@ -22,7 +23,7 @@ fn PyBool::create_unchecked(obj : PyObject) -> PyBool {
 /// If the object is not a boolean, it will raise a TypeMisMatchError.
 pub fn PyBool::create_by_ref(
   obj_ref : @cpython.PyObjectRef
-) -> PyBool!PyRuntimeError {
+) -> PyBool raise PyRuntimeError {
   guard @cpython.py_bool_check(obj_ref) else { raise TypeMisMatchError }
   PyBool::{ obj: PyObject::create(obj_ref) }
 }

callable.mbt

@@ -1,14 +1,15 @@
 // ========================================
 // Function
 // ========================================
+
 ///|
 pub struct PyCallable {
   priv obj : PyObject
 }
 
 ///| Create a python callable object from a PyObject.
 /// If the object is not callable, a TypeMisMatchError is raised.
-pub fn PyCallable::create(obj : PyObject) -> PyCallable!PyRuntimeError {
+pub fn PyCallable::create(obj : PyObject) -> PyCallable raise PyRuntimeError {
   guard obj.is_callable() else { raise TypeMisMatchError }
   PyCallable::{ obj, }
 }
@@ -22,7 +23,7 @@ fn PyCallable::create_unchecked(obj : PyObject) -> PyCallable {
 /// If the object is not callable, a TypeMisMatchError is raised.
 pub fn PyCallable::create_by_ref(
   obj : @cpython.PyObjectRef
-) -> PyCallable!PyRuntimeError {
+) -> PyCallable raise PyRuntimeError {
   guard @cpython.py_callable_check(obj) else { raise TypeMisMatchError }
   PyCallable::{ obj: PyObject::create(obj) }
 }
@@ -45,7 +46,7 @@ pub fn PyCallable::invoke(
   args~ : PyTuple = PyTuple::new(0),
   kwargs~ : PyDict = PyDict::new(),
   print_err~ : Bool = false
-) -> PyObjectEnum?!PyRuntimeError {
+) -> PyObjectEnum? raise PyRuntimeError {
   let obj_ref = if kwargs.len() > 0 {
     @cpython.py_object_call(self.obj_ref(), args.obj_ref(), kwargs.obj_ref())
   } else {

cpython/abstract.mbt

@@ -1,4 +1,5 @@
 // Abstract
+
 ///| Call a callable Python object 'callable' with arguments given by the
 /// tuple 'args' and keywords arguments given by the dictionary 'kwargs'.
 ///
@@ -488,6 +489,7 @@ pub extern "C" fn pysequence_list(obj : PyObjectRef) -> PyObjectRef = "PySequenc
 pub extern "C" fn pysequence_fast(obj : PyObjectRef, msg : CStr) -> PyObjectRef = "PySequence_Fast"
 
 // PyAPI_FUNC(Py_ssize_t) PySequence_Count(py_object *o, PyObject *value);
+
 ///|
 pub extern "C" fn pysequence_count(
   obj : PyObjectRef,
@@ -504,6 +506,7 @@ pub extern "C" fn pysequence_contains(
 ) -> Int = "PySequence_Contains"
 
 // PyAPI_FUNC(Py_ssize_t) PySequence_Index(py_object *o, PyObject *value);
+
 ///|
 pub extern "C" fn pysequence_index(
   obj : PyObjectRef,

cpython/cell.mbt

@@ -1,4 +1,5 @@
 // cell
+
 ///|
 pub extern "C" fn py_cell_new(a : PyObjectRef) -> PyObjectRef = "PyCell_New"
 
@@ -9,6 +10,7 @@ pub extern "C" fn py_cell_get(a : PyObjectRef) -> PyObjectRef = "PyCell_Get"
 pub extern "C" fn py_cell_set(a : PyObjectRef, b : PyObjectRef) -> Int = "PyCell_Set"
 
 // Eval
+
 ///|
 pub extern "C" fn py_eval_eval_code(
   a : PyObjectRef,

cpython/ceval.mbt

@@ -1,4 +1,5 @@
 // ceval
+
 ///|
 pub extern "C" fn py_eval_call_object_with_keywords(
   callable : PyObjectRef,
@@ -10,6 +11,7 @@ pub extern "C" fn py_eval_call_object_with_keywords(
 // pub extern "C" fn py_eval_call_method(obj: PyObjectRef, name: CStr, format: CStr, ...) -> PyObjectRef = "PyEval_CallMethod" // 可变参数 ...
 // pub extern "C" fn py_eval_set_profile(a: Py_tracefunc, b: PyObjectRef) = "PyEval_SetProfile"
 // pub extern "C" fn py_eval_set_trace(a: Py_tracefunc, b: PyObjectRef) = "PyEval_SetTrace"
+
 ///|
 pub extern "C" fn py_eval_get_builtins() -> PyObjectRef = "PyEval_GetBuiltins"
 
@@ -21,6 +23,7 @@ pub extern "C" fn py_eval_get_locals() -> PyObjectRef = "PyEval_GetLocals"
 
 // pub extern "C" fn py_eval_merge_compiler_flags(cf: *PyCompilerFlags) -> Int = "PyEval_MergeCompilerFlags" // 指针类型 *
 // pub extern "C" fn py_add_pending_call(func: *fn(a: *Void) -> Int, arg: *Void) -> Int = "Py_AddPendingCall" // 函数指针, void 指针
+
 ///|
 pub extern "C" fn py_make_pending_calls() -> Int = "Py_MakePendingCalls"
 

cpython/class.mbt

@@ -1,4 +1,5 @@
 // class
+
 ///|
 pub extern "C" fn py_method_new(
   a : PyObjectRef,

cpython/code.mbt

@@ -1,4 +1,5 @@
 // code
+
 ///|
 pub extern "C" fn py_code_new(
   a : Int,

cpython/codecs.mbt

@@ -1,4 +1,5 @@
 // code cs
+
 ///|
 pub extern "C" fn py_codec_register(search_function : PyObjectRef) -> Int = "PyCodec_Register"
 

cpython/context.mbt

@@ -1,4 +1,5 @@
 // context
+
 ///|
 pub extern "C" fn py_context_new() -> PyObjectRef = "PyContext_New"
 

cpython/dict.mbt

@@ -1,4 +1,5 @@
 // dict
+
 ///|
 pub extern "C" fn py_dict_new() -> PyObjectRef = "PyDict_New"
 

cpython/file.mbt

@@ -1,4 +1,5 @@
 // File
+
 ///|
 pub extern "C" fn py_file_from_fd(
   fd : Int,

cpython/import.mbt

@@ -1,4 +1,5 @@
 // Import
+
 ///|
 pub extern "C" fn py_import_get_magic_number() -> Int = "PyImport_GetMagicNumber"
 
@@ -52,6 +53,7 @@ pub extern "C" fn py_import_add_module(name : CStr) -> PyObjectRef = "PyImport_A
 extern "C" fn __py_import_import_module(name : Bytes) -> PyObjectRef = "PyImport_ImportModule"
 
 //extern "C" fn __py_import_import_module(name: Bytes) -> PyObjectRef = "py_import_import_module"
+
 ///|
 pub fn py_import_import_module(name : String) -> PyObjectRef {
   let cstr = ToCStr::to_cstr(name)

cpython/iter.mbt

@@ -1,4 +1,5 @@
 // Iter
+
 ///|
 pub extern "C" fn py_seq_iter_new(a : PyObjectRef) -> PyObjectRef = "PySeqIter_New"
 

cpython/list.mbt

@@ -1,4 +1,5 @@
 // List
+
 ///|
 pub extern "C" fn py_list_new(sz : Int64) -> PyObjectRef = "PyList_New"
 

cpython/number.mbt

@@ -4,10 +4,12 @@
 pub extern "C" fn py_long_from_long(value : Int64) -> PyObjectRef = "PyLong_FromLong"
 
 // As Long
+
 ///|
 pub extern "C" fn py_long_as_long(obj : PyObjectRef) -> Int64 = "PyLong_AsLong"
 
 // As Double
+
 ///|
 pub extern "C" fn py_long_as_double(obj : PyObjectRef) -> Double = "PyLong_AsDouble"
 
@@ -32,6 +34,7 @@ pub extern "C" fn py_float_get_info() -> PyObjectRef = "PyFloat_GetInfo"
 pub extern "C" fn py_float_from_string(obj : PyObjectRef) -> PyObjectRef = "PyFloat_FromString"
 
 // Complex
+
 ///|
 pub extern "C" fn py_complex_from_doubles(
   real : Double,
@@ -45,5 +48,6 @@ pub extern "C" fn py_complex_real_as_double(op : PyObjectRef) -> Double = "PyCom
 pub extern "C" fn py_complex_imag_as_double(op : PyObjectRef) -> Double = "PyComplex_ImagAsDouble"
 
 // Bool
+
 ///|
 pub extern "C" fn py_bool_from_long(value : Int64) -> PyObjectRef = "PyBool_FromLong"

cpython/object.mbt

@@ -96,6 +96,7 @@ pub extern "C" fn py_object_generic_set_attr(
 
 // pub extern "C" fn py_object_hash(a: PyObjectRef) -> Py_hash_t = "PyObject_Hash"
 // pub extern "C" fn py_object_hash_not_implemented(a: PyObjectRef) -> Py_hash_t = "PyObject_HashNotImplemented"
+
 ///|
 extern "C" fn __py_object_is_true(a : PyObjectRef) -> Int = "PyObject_IsTrue"
 

cpython/odict.mbt

@@ -1,4 +1,5 @@
 // ODict
+
 ///|
 pub extern "C" fn py_odict_new() -> PyObjectRef = "PyODict_New"
 

cpython/set.mbt

@@ -1,4 +1,5 @@
 // Set
+
 ///|
 pub extern "C" fn py_set_new(a : PyObjectRef) -> PyObjectRef = "PySet_New"
 

cpython/tuple.mbt

@@ -1,4 +1,5 @@
 // Tuple
+
 ///|
 pub extern "C" fn pytuple_new(sz : UInt64) -> PyObjectRef = "PyTuple_New"
 

cpython/unicode.mbt

@@ -1,4 +1,5 @@
 // Unicode
+
 ///|
 pub extern "C" fn py_unicode_from_unicode(
   u : CWStr,
@@ -21,6 +22,7 @@ pub fn py_unicode_from_string(s : String) -> PyObjectRef {
 }
 
 // PyAPI_FUNC(const char *) PyUnicode_AsUTF8(PyObject *unicode);
+
 ///|
 extern "C" fn __py_unicode_as_utf8(u : PyObjectRef) -> CStr = "PyUnicode_AsUTF8"
 

dict.mbt

@@ -1,14 +1,15 @@
 // ========================================
 // Dict
 // ========================================
+
 ///|
 pub struct PyDict {
   priv obj : PyObject
 }
 
 ///| Create a python dict object.
 /// If the python object is not a dict, it will raise a TypeMisMatchError.
-pub fn PyDict::create(obj : PyObject) -> PyDict!PyRuntimeError {
+pub fn PyDict::create(obj : PyObject) -> PyDict raise PyRuntimeError {
   guard obj.is_dict() else { raise TypeMisMatchError }
   PyDict::{ obj, }
 }
@@ -22,7 +23,7 @@ fn PyDict::create_unchecked(obj : PyObject) -> PyDict {
 /// If the python object is not a dict, it will raise a TypeMisMatchError.
 pub fn PyDict::create_by_ref(
   obj : @cpython.PyObjectRef
-) -> PyDict!PyRuntimeError {
+) -> PyDict raise PyRuntimeError {
   guard @cpython.py_dict_check(obj) else { raise TypeMisMatchError }
   PyDict::{ obj: PyObject::create(obj) }
 }
@@ -197,7 +198,7 @@ pub fn[K : IsPyObject, V : IsPyObject] PyDict::setByObj(
   self : PyDict,
   key : K,
   val : V
-) -> Unit!PyRuntimeError {
+) -> Unit raise PyRuntimeError {
   let dict = self.obj_ref()
   @cpython.py_err_clear()
   let _ = @cpython.py_dict_set_item(dict, key.obj_ref(), val.obj_ref())

errors.mbt

@@ -1,5 +1,5 @@
 ///|
-pub type! PyRuntimeError {
+pub suberror PyRuntimeError {
   TypeMisMatchError
   IndexOutOfBoundsError
   KeyIsUnHashableError

float.mbt

@@ -5,7 +5,7 @@ pub struct PyFloat {
 
 ///| Create a python float object from a python object.
 /// If the python object is not a float, it will raise a TypeMisMatchError.
-pub fn PyFloat::create(obj : PyObject) -> PyFloat!PyRuntimeError {
+pub fn PyFloat::create(obj : PyObject) -> PyFloat raise PyRuntimeError {
   guard obj.is_float() else { raise TypeMisMatchError }
   PyFloat::{ obj, }
 }
@@ -19,7 +19,7 @@ fn PyFloat::create_unchecked(obj : PyObject) -> PyFloat {
 /// If the python object is not a float, it will raise a TypeMisMatchError.
 pub fn PyFloat::create_by_ref(
   obj : @cpython.PyObjectRef
-) -> PyFloat!PyRuntimeError {
+) -> PyFloat raise PyRuntimeError {
   guard @cpython.py_float_check(obj) else { raise TypeMisMatchError }
   PyFloat::{ obj: PyObject::create(obj) }
 }

integer.mbt

@@ -1,14 +1,15 @@
 // ========================================
 // PyInteger
 // ========================================
+
 ///|
 pub struct PyInteger {
   priv obj : PyObject
 }
 
 ///| Create a python integer object from a python object.
 /// If 
-pub fn PyInteger::create(obj : PyObject) -> PyInteger!PyRuntimeError {
+pub fn PyInteger::create(obj : PyObject) -> PyInteger raise PyRuntimeError {
   guard obj.is_int() else { raise TypeMisMatchError }
   PyInteger::{ obj, }
 }
@@ -21,7 +22,7 @@ pub fn PyInteger::create_unchecked(obj : PyObject) -> PyInteger {
 ///|
 pub fn PyInteger::create_by_ref(
   obj : @cpython.PyObjectRef
-) -> PyInteger!PyRuntimeError {
+) -> PyInteger raise PyRuntimeError {
   guard @cpython.py_int_check(obj) else { raise TypeMisMatchError }
   PyInteger::{ obj: PyObject::create(obj) }
 }

list.mbt

@@ -1,6 +1,7 @@
 // ========================================
 // py_list
 // ========================================
+
 ///|
 pub struct PyList {
   priv obj : PyObject
@@ -23,7 +24,7 @@ pub fn PyList::new() -> PyList {
 
 ///| Create a python list object from a pyobject.
 /// If the pyobject is not a list, it will raise a TypeMisMatchError.
-pub fn PyList::create(obj : PyObject) -> PyList!PyRuntimeError {
+pub fn PyList::create(obj : PyObject) -> PyList raise PyRuntimeError {
   guard obj.is_list() else { raise TypeMisMatchError }
   PyList::{ obj, }
 }
@@ -37,7 +38,7 @@ fn PyList::create_unchecked(obj : PyObject) -> PyList {
 /// If the pyobject is not a list, it will raise a TypeMisMatchError.
 pub fn PyList::create_by_ref(
   obj : @cpython.PyObjectRef
-) -> PyList!PyRuntimeError {
+) -> PyList raise PyRuntimeError {
   guard @cpython.py_list_check(obj) else { raise TypeMisMatchError }
   PyList::{ obj: PyObject::create(obj) }
 }
@@ -106,6 +107,7 @@ pub fn[T : IsPyObject] PyList::append(self : PyList, item : T) -> Unit {
 }
 
 // Review: The following code is available, but I don't think it is necessary.
+
 ///| Sort the elements inside the list, using python's built-in sort.
 //pub fn PyList::sort(self: PyList) -> Unit {
 //  let _ = @cpython.py_list_sort(self.obj_ref())
@@ -215,7 +217,7 @@ pub fn[T : IsPyObject] PyList::set(
   self : PyList,
   idx : Int,
   item : T
-) -> Unit!PyRuntimeError {
+) -> Unit raise PyRuntimeError {
   guard idx >= 0 && idx < self.len() else { raise IndexOutOfBoundsError }
   let _ = @cpython.py_list_set_item(
     self.obj_ref(),