summaryrefslogtreecommitdiffstatshomepage
path: root/py/obj.h
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-03-22 20:25:55 +0000
committerDamien George <damien.p.george@gmail.com>2014-03-22 20:25:55 +0000
commit365274da13cc701e3e8f6c72a24dd4eb4083a88d (patch)
tree110170545eae9de4a584f08dd34d259cef0b70a0 /py/obj.h
parent0119fc7532c573bd596fb6173b4d36ef5260027a (diff)
parenta6d53188b7db85af9dc93186e4f36b7009084ea6 (diff)
downloadmicropython-365274da13cc701e3e8f6c72a24dd4eb4083a88d.tar.gz
micropython-365274da13cc701e3e8f6c72a24dd4eb4083a88d.zip
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/obj.h')
-rw-r--r--py/obj.h47
1 files changed, 46 insertions, 1 deletions
diff --git a/py/obj.h b/py/obj.h
index 1daa943447..3217c4a4d1 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -184,9 +184,53 @@ struct _mp_obj_type_t {
typedef struct _mp_obj_type_t mp_obj_type_t;
// Constant types, globally accessible
-
extern const mp_obj_type_t mp_type_type;
+
+// Exceptions
extern const mp_obj_type_t mp_type_BaseException;
+extern const mp_obj_type_t mp_type_ArithmeticError;
+extern const mp_obj_type_t mp_type_AssertionError;
+extern const mp_obj_type_t mp_type_AttributeError;
+extern const mp_obj_type_t mp_type_BufferError;
+extern const mp_obj_type_t mp_type_BytesWarning;
+extern const mp_obj_type_t mp_type_DeprecationWarning;
+extern const mp_obj_type_t mp_type_EOFError;
+extern const mp_obj_type_t mp_type_EnvironmentError;
+extern const mp_obj_type_t mp_type_Exception;
+extern const mp_obj_type_t mp_type_FloatingPointError;
+extern const mp_obj_type_t mp_type_FutureWarning;
+extern const mp_obj_type_t mp_type_GeneratorExit;
+extern const mp_obj_type_t mp_type_IOError;
+extern const mp_obj_type_t mp_type_ImportError;
+extern const mp_obj_type_t mp_type_ImportWarning;
+extern const mp_obj_type_t mp_type_IndentationError;
+extern const mp_obj_type_t mp_type_IndexError;
+extern const mp_obj_type_t mp_type_KeyError;
+extern const mp_obj_type_t mp_type_LookupError;
+extern const mp_obj_type_t mp_type_MemoryError;
+extern const mp_obj_type_t mp_type_NameError;
+extern const mp_obj_type_t mp_type_NotImplementedError;
+extern const mp_obj_type_t mp_type_OSError;
+extern const mp_obj_type_t mp_type_OverflowError;
+extern const mp_obj_type_t mp_type_PendingDeprecationWarning;
+extern const mp_obj_type_t mp_type_ReferenceError;
+extern const mp_obj_type_t mp_type_ResourceWarning;
+extern const mp_obj_type_t mp_type_RuntimeError;
+extern const mp_obj_type_t mp_type_RuntimeWarning;
+extern const mp_obj_type_t mp_type_SyntaxError;
+extern const mp_obj_type_t mp_type_SyntaxWarning;
+extern const mp_obj_type_t mp_type_SystemError;
+extern const mp_obj_type_t mp_type_SystemExit;
+extern const mp_obj_type_t mp_type_TabError;
+extern const mp_obj_type_t mp_type_TypeError;
+extern const mp_obj_type_t mp_type_UnboundLocalError;
+extern const mp_obj_type_t mp_type_UserWarning;
+extern const mp_obj_type_t mp_type_ValueError;
+extern const mp_obj_type_t mp_type_Warning;
+extern const mp_obj_type_t mp_type_ZeroDivisionError;
+
+extern const mp_obj_type_t mp_type_StopIteration;
+/*extern const mp_obj_type_t mp_type_BaseException;
extern const mp_obj_type_t mp_type_AssertionError;
extern const mp_obj_type_t mp_type_AttributeError;
extern const mp_obj_type_t mp_type_ImportError;
@@ -201,6 +245,7 @@ extern const mp_obj_type_t mp_type_OverflowError;
extern const mp_obj_type_t mp_type_OSError;
extern const mp_obj_type_t mp_type_NotImplementedError;
extern const mp_obj_type_t mp_type_StopIteration;
+extern const mp_obj_type_t mp_type_ZeroDivisionError;*/
// Constant objects, globally accessible