Revision 1:873275b0210d, committed 2016-04-16

Comitter:

Colin Hogben

Date:

Sat Apr 16 22:42:43 2016 +0100

Parent:

0:5868e8752d44

Child:

2:c89e95946844

Commit message:

modmachine: cope with gerated qstrdefs

Changed in this revision

--- a/genhdr/qstrdefs.generated.h	Sat Apr 16 17:11:56 2016 +0000
+++ b/genhdr/qstrdefs.generated.h	Sat Apr 16 22:42:43 2016 +0100
@@ -4,184 +4,140 @@
 QDEF(MP_QSTR_, (const byte*)"\x05\x15\x00" "")
 QDEF(MP_QSTR__star_, (const byte*)"\x8f\xb5\x01" "*")
 QDEF(MP_QSTR__, (const byte*)"\xfa\xb5\x01" "_")
-QDEF(MP_QSTR___build_class__, (const byte*)"\x42\x88\x0f" "__build_class__")
-QDEF(MP_QSTR___class__, (const byte*)"\x2b\xc5\x09" "__class__")
-QDEF(MP_QSTR___doc__, (const byte*)"\x2d\xac\x07" "__doc__")
-QDEF(MP_QSTR___import__, (const byte*)"\x38\x3e\x0a" "__import__")
-QDEF(MP_QSTR___init__, (const byte*)"\x5f\xa5\x08" "__init__")
-QDEF(MP_QSTR___new__, (const byte*)"\x79\x15\x07" "__new__")
+QDEF(MP_QSTR__percent__hash_o, (const byte*)"\x6c\x1a\x03" "%#o")
+QDEF(MP_QSTR__percent__hash_x, (const byte*)"\x7b\x1a\x03" "%#x")
+QDEF(MP_QSTR__brace_open__colon__hash_b_brace_close_, (const byte*)"\x58\x37\x05" "{:#b}")
+QDEF(MP_QSTR__0x0a_, (const byte*)"\xaf\xb5\x01" "\x0a")
+QDEF(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded, (const byte*)"\x73\x1e\x20" "maximum recursion depth exceeded")
+QDEF(MP_QSTR__lt_module_gt_, (const byte*)"\xbd\x94\x08" "<module>")
+QDEF(MP_QSTR__lt_lambda_gt_, (const byte*)"\x80\x8c\x08" "<lambda>")
+QDEF(MP_QSTR__lt_listcomp_gt_, (const byte*)"\xd4\x15\x0a" "<listcomp>")
+QDEF(MP_QSTR__lt_dictcomp_gt_, (const byte*)"\xcc\x8d\x0a" "<dictcomp>")
+QDEF(MP_QSTR__lt_setcomp_gt_, (const byte*)"\x54\x51\x09" "<setcomp>")
+QDEF(MP_QSTR__lt_genexpr_gt_, (const byte*)"\x34\x6a\x09" "<genexpr>")
+QDEF(MP_QSTR__lt_string_gt_, (const byte*)"\x52\x53\x08" "<string>")
+QDEF(MP_QSTR__lt_stdin_gt_, (const byte*)"\xe3\x63\x07" "<stdin>")
+QDEF(MP_QSTR_utf_hyphen_8, (const byte*)"\xb7\x82\x05" "utf-8")
 QDEF(MP_QSTR___locals__, (const byte*)"\x7b\x6a\x0a" "__locals__")
-QDEF(MP_QSTR___main__, (const byte*)"\x8e\x13\x08" "__main__")
-QDEF(MP_QSTR___module__, (const byte*)"\xff\x30\x0a" "__module__")
-QDEF(MP_QSTR___name__, (const byte*)"\xe2\x38\x08" "__name__")
-QDEF(MP_QSTR___dict__, (const byte*)"\x7f\x54\x08" "__dict__")
-QDEF(MP_QSTR___hash__, (const byte*)"\xf7\xc8\x08" "__hash__")
-QDEF(MP_QSTR___next__, (const byte*)"\x02\x73\x08" "__next__")
-QDEF(MP_QSTR___qualname__, (const byte*)"\x6b\x00\x0c" "__qualname__")
-QDEF(MP_QSTR___path__, (const byte*)"\xc8\x23\x08" "__path__")
-QDEF(MP_QSTR___repl_print__, (const byte*)"\x00\xbb\x0e" "__repl_print__")
-QDEF(MP_QSTR___bool__, (const byte*)"\x2b\x65\x08" "__bool__")
-QDEF(MP_QSTR___contains__, (const byte*)"\xc6\x5f\x0c" "__contains__")
-QDEF(MP_QSTR___enter__, (const byte*)"\x6d\xba\x09" "__enter__")
-QDEF(MP_QSTR___exit__, (const byte*)"\x45\xf8\x08" "__exit__")
-QDEF(MP_QSTR___len__, (const byte*)"\xe2\xb0\x07" "__len__")
-QDEF(MP_QSTR___iter__, (const byte*)"\xcf\x32\x08" "__iter__")
-QDEF(MP_QSTR___getitem__, (const byte*)"\x26\x39\x0b" "__getitem__")
-QDEF(MP_QSTR___setitem__, (const byte*)"\x32\x3e\x0b" "__setitem__")
-QDEF(MP_QSTR___delitem__, (const byte*)"\xfd\x35\x0b" "__delitem__")
-QDEF(MP_QSTR___add__, (const byte*)"\xc4\x82\x07" "__add__")
-QDEF(MP_QSTR___sub__, (const byte*)"\x21\x09\x07" "__sub__")
-QDEF(MP_QSTR___repr__, (const byte*)"\x10\x0b\x08" "__repr__")
-QDEF(MP_QSTR___str__, (const byte*)"\xd0\xcd\x07" "__str__")
-QDEF(MP_QSTR___getattr__, (const byte*)"\x40\xf8\x0b" "__getattr__")
-QDEF(MP_QSTR___del__, (const byte*)"\x68\x37\x07" "__del__")
-QDEF(MP_QSTR___call__, (const byte*)"\xa7\xf9\x08" "__call__")
-QDEF(MP_QSTR___lt__, (const byte*)"\x5d\x68\x06" "__lt__")
-QDEF(MP_QSTR___gt__, (const byte*)"\xb6\x82\x06" "__gt__")
-QDEF(MP_QSTR___eq__, (const byte*)"\x71\x3e\x06" "__eq__")
-QDEF(MP_QSTR___le__, (const byte*)"\xcc\x13\x06" "__le__")
-QDEF(MP_QSTR___ge__, (const byte*)"\xa7\x46\x06" "__ge__")
-QDEF(MP_QSTR___reversed__, (const byte*)"\x61\xff\x0c" "__reversed__")
-QDEF(MP_QSTR_micropython, (const byte*)"\x0b\x7c\x0b" "micropython")
-QDEF(MP_QSTR_bytecode, (const byte*)"\x22\x7d\x08" "bytecode")
-QDEF(MP_QSTR_const, (const byte*)"\xc0\xff\x05" "const")
-QDEF(MP_QSTR_builtins, (const byte*)"\xf7\x31\x08" "builtins")
-QDEF(MP_QSTR_Ellipsis, (const byte*)"\xf0\xe0\x08" "Ellipsis")
-QDEF(MP_QSTR_StopIteration, (const byte*)"\xea\x1c\x0d" "StopIteration")
-QDEF(MP_QSTR_BaseException, (const byte*)"\x07\x92\x0d" "BaseException")
-QDEF(MP_QSTR_ArithmeticError, (const byte*)"\x2d\x8c\x0f" "ArithmeticError")
-QDEF(MP_QSTR_AssertionError, (const byte*)"\x97\x5a\x0e" "AssertionError")
-QDEF(MP_QSTR_AttributeError, (const byte*)"\x21\xde\x0e" "AttributeError")
 QDEF(MP_QSTR_BufferError, (const byte*)"\x1d\x59\x0b" "BufferError")
-QDEF(MP_QSTR_EOFError, (const byte*)"\x91\xbf\x08" "EOFError")
-QDEF(MP_QSTR_Exception, (const byte*)"\xf2\x29\x09" "Exception")
 QDEF(MP_QSTR_FileExistsError, (const byte*)"\x5b\x14\x0f" "FileExistsError")
 QDEF(MP_QSTR_FileNotFoundError, (const byte*)"\x78\x89\x11" "FileNotFoundError")
 QDEF(MP_QSTR_FloatingPointError, (const byte*)"\x01\x34\x12" "FloatingPointError")
-QDEF(MP_QSTR_GeneratorExit, (const byte*)"\x16\x62\x0d" "GeneratorExit")
-QDEF(MP_QSTR_ImportError, (const byte*)"\x20\x9c\x0b" "ImportError")
-QDEF(MP_QSTR_IndentationError, (const byte*)"\x5c\x20\x10" "IndentationError")
-QDEF(MP_QSTR_IndexError, (const byte*)"\x83\xad\x0a" "IndexError")
-QDEF(MP_QSTR_KeyboardInterrupt, (const byte*)"\xaf\xe2\x11" "KeyboardInterrupt")
-QDEF(MP_QSTR_KeyError, (const byte*)"\xea\x00\x08" "KeyError")
-QDEF(MP_QSTR_LookupError, (const byte*)"\xff\x69\x0b" "LookupError")
-QDEF(MP_QSTR_MemoryError, (const byte*)"\xdc\x83\x0b" "MemoryError")
-QDEF(MP_QSTR_NameError, (const byte*)"\xba\x2d\x09" "NameError")
-QDEF(MP_QSTR_NotImplementedError, (const byte*)"\xc6\x98\x13" "NotImplementedError")
-QDEF(MP_QSTR_OSError, (const byte*)"\xa1\x65\x07" "OSError")
-QDEF(MP_QSTR_OverflowError, (const byte*)"\x81\xe1\x0d" "OverflowError")
-QDEF(MP_QSTR_RuntimeError, (const byte*)"\x61\xf1\x0c" "RuntimeError")
-QDEF(MP_QSTR_SyntaxError, (const byte*)"\x94\x8f\x0b" "SyntaxError")
-QDEF(MP_QSTR_SystemExit, (const byte*)"\x20\xff\x0a" "SystemExit")
-QDEF(MP_QSTR_TypeError, (const byte*)"\x25\x96\x09" "TypeError")
 QDEF(MP_QSTR_UnboundLocalError, (const byte*)"\x99\x22\x11" "UnboundLocalError")
-QDEF(MP_QSTR_ValueError, (const byte*)"\x96\x87\x0a" "ValueError")
-QDEF(MP_QSTR_ZeroDivisionError, (const byte*)"\xb6\x27\x11" "ZeroDivisionError")
-QDEF(MP_QSTR_None, (const byte*)"\x6f\xd1\x04" "None")
-QDEF(MP_QSTR_False, (const byte*)"\x38\x6f\x05" "False")
-QDEF(MP_QSTR_True, (const byte*)"\x13\x17\x04" "True")
-QDEF(MP_QSTR_object, (const byte*)"\x90\x8d\x06" "object")
-QDEF(MP_QSTR_NoneType, (const byte*)"\x17\x68\x08" "NoneType")
-QDEF(MP_QSTR_abs, (const byte*)"\x95\x32\x03" "abs")
-QDEF(MP_QSTR_all, (const byte*)"\x44\x33\x03" "all")
-QDEF(MP_QSTR_any, (const byte*)"\x13\x33\x03" "any")
-QDEF(MP_QSTR_args, (const byte*)"\xc2\xc6\x04" "args")
-QDEF(MP_QSTR_bin, (const byte*)"\xe0\x48\x03" "bin")
-QDEF(MP_QSTR__brace_open__colon__hash_b_brace_close_, (const byte*)"\x58\x37\x05" "{:#b}")
+QDEF(MP_QSTR_machine, (const byte*)"\x60\xab\x07" "machine")
+QDEF(MP_QSTR_reset, (const byte*)"\x10\xf4\x05" "reset")
+QDEF(MP_QSTR_mbed, (const byte*)"\x0b\xb5\x04" "mbed")
+QDEF(MP_QSTR_DigitalOut, (const byte*)"\x11\xcb\x0a" "DigitalOut")
+QDEF(MP_QSTR_write, (const byte*)"\x98\xa8\x05" "write")
+QDEF(MP_QSTR___name__, (const byte*)"\xe2\x38\x08" "__name__")
+QDEF(MP_QSTR_umachine, (const byte*)"\x95\x7f\x08" "umachine")
+QDEF(MP_QSTR_mem8, (const byte*)"\x18\xc8\x04" "mem8")
+QDEF(MP_QSTR_mem16, (const byte*)"\x07\xca\x05" "mem16")
+QDEF(MP_QSTR_mem32, (const byte*)"\x41\xca\x05" "mem32")
+QDEF(MP_QSTR_micropython, (const byte*)"\x0b\x7c\x0b" "micropython")
+QDEF(MP_QSTR_bytecode, (const byte*)"\x22\x7d\x08" "bytecode")
+QDEF(MP_QSTR_AssertionError, (const byte*)"\x97\x5a\x0e" "AssertionError")
+QDEF(MP_QSTR_range, (const byte*)"\x1a\x5e\x05" "range")
+QDEF(MP_QSTR___aiter__, (const byte*)"\x4e\x2b\x09" "__aiter__")
+QDEF(MP_QSTR___anext__, (const byte*)"\x83\xb4\x09" "__anext__")
+QDEF(MP_QSTR_StopAsyncIteration, (const byte*)"\xec\xf0\x12" "StopAsyncIteration")
+QDEF(MP_QSTR___aenter__, (const byte*)"\x4c\x84\x0a" "__aenter__")
+QDEF(MP_QSTR___aexit__, (const byte*)"\xc4\xcf\x09" "__aexit__")
+QDEF(MP_QSTR___repl_print__, (const byte*)"\x00\xbb\x0e" "__repl_print__")
+QDEF(MP_QSTR_super, (const byte*)"\xc4\xb2\x05" "super")
+QDEF(MP_QSTR___class__, (const byte*)"\x2b\xc5\x09" "__class__")
+QDEF(MP_QSTR___module__, (const byte*)"\xff\x30\x0a" "__module__")
+QDEF(MP_QSTR___qualname__, (const byte*)"\x6b\x00\x0c" "__qualname__")
+QDEF(MP_QSTR___main__, (const byte*)"\x8e\x13\x08" "__main__")
+QDEF(MP_QSTR_items, (const byte*)"\xe3\x53\x05" "items")
+QDEF(MP_QSTR_function, (const byte*)"\x27\x02\x08" "function")
+QDEF(MP_QSTR_closure, (const byte*)"\x74\xca\x07" "closure")
+QDEF(MP_QSTR_generator, (const byte*)"\x96\xc3\x09" "generator")
+QDEF(MP_QSTR___next__, (const byte*)"\x02\x73\x08" "__next__")
+QDEF(MP_QSTR___getitem__, (const byte*)"\x26\x39\x0b" "__getitem__")
+QDEF(MP_QSTR_send, (const byte*)"\xb9\x76\x04" "send")
+QDEF(MP_QSTR_close, (const byte*)"\x33\x67\x05" "close")
+QDEF(MP_QSTR_throw, (const byte*)"\xb3\x44\x05" "throw")
 QDEF(MP_QSTR_bool, (const byte*)"\xeb\x3c\x04" "bool")
-QDEF(MP_QSTR_bytes, (const byte*)"\x5c\xb2\x05" "bytes")
-QDEF(MP_QSTR_callable, (const byte*)"\x0d\x70\x08" "callable")
-QDEF(MP_QSTR_chr, (const byte*)"\xdc\x4c\x03" "chr")
-QDEF(MP_QSTR_classmethod, (const byte*)"\xb4\x8c\x0b" "classmethod")
-QDEF(MP_QSTR__collections, (const byte*)"\x3f\x35\x0c" "_collections")
-QDEF(MP_QSTR_dict, (const byte*)"\x3f\xfc\x04" "dict")
-QDEF(MP_QSTR_dir, (const byte*)"\xfa\x1e\x03" "dir")
-QDEF(MP_QSTR_divmod, (const byte*)"\xb8\x04\x06" "divmod")
-QDEF(MP_QSTR_eval, (const byte*)"\x9b\xa6\x04" "eval")
-QDEF(MP_QSTR_exec, (const byte*)"\x1e\xc0\x04" "exec")
-QDEF(MP_QSTR_from_bytes, (const byte*)"\x35\x74\x0a" "from_bytes")
-QDEF(MP_QSTR_getattr, (const byte*)"\xc0\x17\x07" "getattr")
-QDEF(MP_QSTR_setattr, (const byte*)"\xd4\xa8\x07" "setattr")
-QDEF(MP_QSTR_globals, (const byte*)"\x9d\x49\x07" "globals")
-QDEF(MP_QSTR_hasattr, (const byte*)"\x8c\xb0\x07" "hasattr")
-QDEF(MP_QSTR_hash, (const byte*)"\xb7\x70\x04" "hash")
-QDEF(MP_QSTR_hex, (const byte*)"\x70\x50\x03" "hex")
-QDEF(MP_QSTR__percent__hash_x, (const byte*)"\x7b\x1a\x03" "%#x")
-QDEF(MP_QSTR_id, (const byte*)"\x28\x6f\x02" "id")
-QDEF(MP_QSTR_int, (const byte*)"\x16\x53\x03" "int")
-QDEF(MP_QSTR_isinstance, (const byte*)"\xb6\xbe\x0a" "isinstance")
-QDEF(MP_QSTR_issubclass, (const byte*)"\xb5\x7f\x0a" "issubclass")
-QDEF(MP_QSTR_iter, (const byte*)"\x8f\x21\x04" "iter")
-QDEF(MP_QSTR_len, (const byte*)"\x62\x40\x03" "len")
-QDEF(MP_QSTR_list, (const byte*)"\x27\x1d\x04" "list")
-QDEF(MP_QSTR_locals, (const byte*)"\x3b\xa1\x06" "locals")
-QDEF(MP_QSTR_map, (const byte*)"\xb9\x43\x03" "map")
-QDEF(MP_QSTR_namedtuple, (const byte*)"\x1e\x16\x0a" "namedtuple")
-QDEF(MP_QSTR_next, (const byte*)"\x42\x88\x04" "next")
-QDEF(MP_QSTR_oct, (const byte*)"\xfd\x5c\x03" "oct")
-QDEF(MP_QSTR__percent__hash_o, (const byte*)"\x6c\x1a\x03" "%#o")
-QDEF(MP_QSTR_open, (const byte*)"\xd1\x3a\x04" "open")
-QDEF(MP_QSTR_ord, (const byte*)"\x1c\x5e\x03" "ord")
-QDEF(MP_QSTR_path, (const byte*)"\x88\xce\x04" "path")
-QDEF(MP_QSTR_pow, (const byte*)"\x2d\x73\x03" "pow")
-QDEF(MP_QSTR_print, (const byte*)"\x54\xc6\x05" "print")
-QDEF(MP_QSTR_range, (const byte*)"\x1a\x5e\x05" "range")
-QDEF(MP_QSTR_read, (const byte*)"\xb7\xf9\x04" "read")
-QDEF(MP_QSTR_repr, (const byte*)"\xd0\xf7\x04" "repr")
-QDEF(MP_QSTR_reversed, (const byte*)"\xa1\x6e\x08" "reversed")
-QDEF(MP_QSTR_round, (const byte*)"\xe7\x25\x05" "round")
-QDEF(MP_QSTR_sorted, (const byte*)"\x5e\x15\x06" "sorted")
-QDEF(MP_QSTR_staticmethod, (const byte*)"\x62\xaf\x0c" "staticmethod")
-QDEF(MP_QSTR_sum, (const byte*)"\x2e\x8d\x03" "sum")
-QDEF(MP_QSTR_super, (const byte*)"\xc4\xb2\x05" "super")
-QDEF(MP_QSTR_str, (const byte*)"\x50\x8d\x03" "str")
-QDEF(MP_QSTR_sys, (const byte*)"\xbc\x8e\x03" "sys")
-QDEF(MP_QSTR_to_bytes, (const byte*)"\xd8\x3e\x08" "to_bytes")
-QDEF(MP_QSTR_tuple, (const byte*)"\xfd\x41\x05" "tuple")
-QDEF(MP_QSTR_type, (const byte*)"\x9d\x7f\x04" "type")
-QDEF(MP_QSTR_value, (const byte*)"\x4e\x34\x05" "value")
-QDEF(MP_QSTR_write, (const byte*)"\x98\xa8\x05" "write")
-QDEF(MP_QSTR_zip, (const byte*)"\xe6\xac\x03" "zip")
-QDEF(MP_QSTR_sep, (const byte*)"\x23\x8f\x03" "sep")
-QDEF(MP_QSTR_end, (const byte*)"\x0a\x23\x03" "end")
-QDEF(MP_QSTR_step, (const byte*)"\x57\x36\x04" "step")
-QDEF(MP_QSTR_stop, (const byte*)"\x9d\x36\x04" "stop")
+QDEF(MP_QSTR_bound_method, (const byte*)"\x97\xa2\x0c" "bound_method")
+QDEF(MP_QSTR_iterator, (const byte*)"\x47\xbe\x08" "iterator")
+QDEF(MP_QSTR_dict_view, (const byte*)"\x2d\xa9\x09" "dict_view")
 QDEF(MP_QSTR_clear, (const byte*)"\x7c\xa0\x05" "clear")
 QDEF(MP_QSTR_copy, (const byte*)"\xe0\xdb\x04" "copy")
 QDEF(MP_QSTR_fromkeys, (const byte*)"\x37\xbd\x08" "fromkeys")
 QDEF(MP_QSTR_get, (const byte*)"\x33\x3b\x03" "get")
-QDEF(MP_QSTR_items, (const byte*)"\xe3\x53\x05" "items")
 QDEF(MP_QSTR_keys, (const byte*)"\x01\x13\x04" "keys")
 QDEF(MP_QSTR_pop, (const byte*)"\x2a\x73\x03" "pop")
 QDEF(MP_QSTR_popitem, (const byte*)"\xbf\x2c\x07" "popitem")
 QDEF(MP_QSTR_setdefault, (const byte*)"\x6c\xa3\x0a" "setdefault")
 QDEF(MP_QSTR_update, (const byte*)"\xb4\x76\x06" "update")
 QDEF(MP_QSTR_values, (const byte*)"\x7d\xbe\x06" "values")
+QDEF(MP_QSTR___setitem__, (const byte*)"\x32\x3e\x0b" "__setitem__")
+QDEF(MP_QSTR___delitem__, (const byte*)"\xfd\x35\x0b" "__delitem__")
+QDEF(MP_QSTR_dict, (const byte*)"\x3f\xfc\x04" "dict")
+QDEF(MP_QSTR_args, (const byte*)"\xc2\xc6\x04" "args")
+QDEF(MP_QSTR_value, (const byte*)"\x4e\x34\x05" "value")
+QDEF(MP_QSTR___init__, (const byte*)"\x5f\xa5\x08" "__init__")
+QDEF(MP_QSTR_BaseException, (const byte*)"\x07\x92\x0d" "BaseException")
+QDEF(MP_QSTR_SystemExit, (const byte*)"\x20\xff\x0a" "SystemExit")
+QDEF(MP_QSTR_KeyboardInterrupt, (const byte*)"\xaf\xe2\x11" "KeyboardInterrupt")
+QDEF(MP_QSTR_GeneratorExit, (const byte*)"\x16\x62\x0d" "GeneratorExit")
+QDEF(MP_QSTR_Exception, (const byte*)"\xf2\x29\x09" "Exception")
+QDEF(MP_QSTR_StopIteration, (const byte*)"\xea\x1c\x0d" "StopIteration")
+QDEF(MP_QSTR_ArithmeticError, (const byte*)"\x2d\x8c\x0f" "ArithmeticError")
+QDEF(MP_QSTR_OverflowError, (const byte*)"\x81\xe1\x0d" "OverflowError")
+QDEF(MP_QSTR_ZeroDivisionError, (const byte*)"\xb6\x27\x11" "ZeroDivisionError")
+QDEF(MP_QSTR_AttributeError, (const byte*)"\x21\xde\x0e" "AttributeError")
+QDEF(MP_QSTR_EOFError, (const byte*)"\x91\xbf\x08" "EOFError")
+QDEF(MP_QSTR_ImportError, (const byte*)"\x20\x9c\x0b" "ImportError")
+QDEF(MP_QSTR_LookupError, (const byte*)"\xff\x69\x0b" "LookupError")
+QDEF(MP_QSTR_IndexError, (const byte*)"\x83\xad\x0a" "IndexError")
+QDEF(MP_QSTR_KeyError, (const byte*)"\xea\x00\x08" "KeyError")
+QDEF(MP_QSTR_MemoryError, (const byte*)"\xdc\x83\x0b" "MemoryError")
+QDEF(MP_QSTR_NameError, (const byte*)"\xba\x2d\x09" "NameError")
+QDEF(MP_QSTR_OSError, (const byte*)"\xa1\x65\x07" "OSError")
+QDEF(MP_QSTR_RuntimeError, (const byte*)"\x61\xf1\x0c" "RuntimeError")
+QDEF(MP_QSTR_NotImplementedError, (const byte*)"\xc6\x98\x13" "NotImplementedError")
+QDEF(MP_QSTR_SyntaxError, (const byte*)"\x94\x8f\x0b" "SyntaxError")
+QDEF(MP_QSTR_IndentationError, (const byte*)"\x5c\x20\x10" "IndentationError")
+QDEF(MP_QSTR_TypeError, (const byte*)"\x25\x96\x09" "TypeError")
+QDEF(MP_QSTR_ValueError, (const byte*)"\x96\x87\x0a" "ValueError")
+QDEF(MP_QSTR_from_bytes, (const byte*)"\x35\x74\x0a" "from_bytes")
+QDEF(MP_QSTR_to_bytes, (const byte*)"\xd8\x3e\x08" "to_bytes")
+QDEF(MP_QSTR_int, (const byte*)"\x16\x53\x03" "int")
+QDEF(MP_QSTR_key, (const byte*)"\x32\x6d\x03" "key")
+QDEF(MP_QSTR_reverse, (const byte*)"\x25\x2a\x07" "reverse")
 QDEF(MP_QSTR_append, (const byte*)"\x6b\x97\x06" "append")
-QDEF(MP_QSTR_close, (const byte*)"\x33\x67\x05" "close")
-QDEF(MP_QSTR_send, (const byte*)"\xb9\x76\x04" "send")
-QDEF(MP_QSTR_throw, (const byte*)"\xb3\x44\x05" "throw")
 QDEF(MP_QSTR_count, (const byte*)"\xa6\x4d\x05" "count")
 QDEF(MP_QSTR_extend, (const byte*)"\x63\xe8\x06" "extend")
 QDEF(MP_QSTR_index, (const byte*)"\x7b\x28\x05" "index")
+QDEF(MP_QSTR_insert, (const byte*)"\x12\x54\x06" "insert")
 QDEF(MP_QSTR_remove, (const byte*)"\x63\x8a\x06" "remove")
-QDEF(MP_QSTR_insert, (const byte*)"\x12\x54\x06" "insert")
 QDEF(MP_QSTR_sort, (const byte*)"\xbf\x9d\x04" "sort")
+QDEF(MP_QSTR_list, (const byte*)"\x27\x1d\x04" "list")
+QDEF(MP_QSTR_map, (const byte*)"\xb9\x43\x03" "map")
+QDEF(MP_QSTR_module, (const byte*)"\xbf\x99\x06" "module")
+QDEF(MP_QSTR_builtins, (const byte*)"\xf7\x31\x08" "builtins")
+QDEF(MP_QSTR_ustruct, (const byte*)"\x47\x08\x07" "ustruct")
+QDEF(MP_QSTR_sys, (const byte*)"\xbc\x8e\x03" "sys")
+QDEF(MP_QSTR_object, (const byte*)"\x90\x8d\x06" "object")
+QDEF(MP_QSTR_NoneType, (const byte*)"\x17\x68\x08" "NoneType")
+QDEF(MP_QSTR_start, (const byte*)"\x85\xef\x05" "start")
+QDEF(MP_QSTR_stop, (const byte*)"\x9d\x36\x04" "stop")
+QDEF(MP_QSTR_step, (const byte*)"\x57\x36\x04" "step")
+QDEF(MP_QSTR_Ellipsis, (const byte*)"\xf0\xe0\x08" "Ellipsis")
+QDEF(MP_QSTR_find, (const byte*)"\x00\x34\x04" "find")
+QDEF(MP_QSTR_rfind, (const byte*)"\xd2\x9c\x05" "rfind")
+QDEF(MP_QSTR_rindex, (const byte*)"\xe9\x2b\x06" "rindex")
 QDEF(MP_QSTR_join, (const byte*)"\xa7\x5c\x04" "join")
+QDEF(MP_QSTR_split, (const byte*)"\xb7\x33\x05" "split")
+QDEF(MP_QSTR_rsplit, (const byte*)"\xa5\x00\x06" "rsplit")
+QDEF(MP_QSTR_startswith, (const byte*)"\x74\xe8\x0a" "startswith")
+QDEF(MP_QSTR_endswith, (const byte*)"\x1b\xa3\x08" "endswith")
 QDEF(MP_QSTR_strip, (const byte*)"\x29\x1e\x05" "strip")
 QDEF(MP_QSTR_lstrip, (const byte*)"\xe5\xb9\x06" "lstrip")
 QDEF(MP_QSTR_rstrip, (const byte*)"\x3b\x95\x06" "rstrip")
 QDEF(MP_QSTR_format, (const byte*)"\x26\x33\x06" "format")
-QDEF(MP_QSTR_key, (const byte*)"\x32\x6d\x03" "key")
-QDEF(MP_QSTR_reverse, (const byte*)"\x25\x2a\x07" "reverse")
-QDEF(MP_QSTR_add, (const byte*)"\x44\x32\x03" "add")
-QDEF(MP_QSTR_find, (const byte*)"\x00\x34\x04" "find")
-QDEF(MP_QSTR_rfind, (const byte*)"\xd2\x9c\x05" "rfind")
-QDEF(MP_QSTR_rindex, (const byte*)"\xe9\x2b\x06" "rindex")
-QDEF(MP_QSTR_split, (const byte*)"\xb7\x33\x05" "split")
-QDEF(MP_QSTR_rsplit, (const byte*)"\xa5\x00\x06" "rsplit")
-QDEF(MP_QSTR_startswith, (const byte*)"\x74\xe8\x0a" "startswith")
-QDEF(MP_QSTR_endswith, (const byte*)"\x1b\xa3\x08" "endswith")
 QDEF(MP_QSTR_replace, (const byte*)"\x49\x25\x07" "replace")
 QDEF(MP_QSTR_partition, (const byte*)"\x87\xe5\x09" "partition")
 QDEF(MP_QSTR_rpartition, (const byte*)"\x15\xd0\x0a" "rpartition")
@@ -192,51 +148,80 @@
 QDEF(MP_QSTR_isdigit, (const byte*)"\xa8\x9a\x07" "isdigit")
 QDEF(MP_QSTR_isupper, (const byte*)"\xdd\xa7\x07" "isupper")
 QDEF(MP_QSTR_islower, (const byte*)"\xfc\x80\x07" "islower")
-QDEF(MP_QSTR_iterable, (const byte*)"\x25\x92\x08" "iterable")
-QDEF(MP_QSTR_start, (const byte*)"\x85\xef\x05" "start")
-QDEF(MP_QSTR_bound_method, (const byte*)"\x97\xa2\x0c" "bound_method")
-QDEF(MP_QSTR_closure, (const byte*)"\x74\xca\x07" "closure")
-QDEF(MP_QSTR_dict_view, (const byte*)"\x2d\xa9\x09" "dict_view")
-QDEF(MP_QSTR_function, (const byte*)"\x27\x02\x08" "function")
-QDEF(MP_QSTR_generator, (const byte*)"\x96\xc3\x09" "generator")
-QDEF(MP_QSTR_iterator, (const byte*)"\x47\xbe\x08" "iterator")
-QDEF(MP_QSTR_module, (const byte*)"\xbf\x99\x06" "module")
-QDEF(MP_QSTR_slice, (const byte*)"\xb5\xf4\x05" "slice")
-QDEF(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded, (const byte*)"\x73\x1e\x20" "maximum recursion depth exceeded")
-QDEF(MP_QSTR__lt_module_gt_, (const byte*)"\xbd\x94\x08" "<module>")
-QDEF(MP_QSTR__lt_lambda_gt_, (const byte*)"\x80\x8c\x08" "<lambda>")
-QDEF(MP_QSTR__lt_listcomp_gt_, (const byte*)"\xd4\x15\x0a" "<listcomp>")
-QDEF(MP_QSTR__lt_dictcomp_gt_, (const byte*)"\xcc\x8d\x0a" "<dictcomp>")
-QDEF(MP_QSTR__lt_setcomp_gt_, (const byte*)"\x54\x51\x09" "<setcomp>")
-QDEF(MP_QSTR__lt_genexpr_gt_, (const byte*)"\x34\x6a\x09" "<genexpr>")
-QDEF(MP_QSTR__lt_string_gt_, (const byte*)"\x52\x53\x08" "<string>")
-QDEF(MP_QSTR__lt_stdin_gt_, (const byte*)"\xe3\x63\x07" "<stdin>")
-QDEF(MP_QSTR_argv, (const byte*)"\xc7\xc6\x04" "argv")
-QDEF(MP_QSTR_byteorder, (const byte*)"\x61\x99\x09" "byteorder")
-QDEF(MP_QSTR_big, (const byte*)"\xe9\x48\x03" "big")
-QDEF(MP_QSTR_exit, (const byte*)"\x85\xbe\x04" "exit")
-QDEF(MP_QSTR_little, (const byte*)"\x89\x6a\x06" "little")
-QDEF(MP_QSTR_stdin, (const byte*)"\x21\x04\x05" "stdin")
-QDEF(MP_QSTR_stdout, (const byte*)"\x08\x83\x06" "stdout")
-QDEF(MP_QSTR_stderr, (const byte*)"\xa3\x58\x06" "stderr")
-QDEF(MP_QSTR_version, (const byte*)"\xbf\xd3\x07" "version")
-QDEF(MP_QSTR_version_info, (const byte*)"\x6e\x0a\x0c" "version_info")
-QDEF(MP_QSTR_implementation, (const byte*)"\x17\x2d\x0e" "implementation")
-QDEF(MP_QSTR_modules, (const byte*)"\xec\xd1\x07" "modules")
-QDEF(MP_QSTR_print_exception, (const byte*)"\x1c\x22\x0f" "print_exception")
-QDEF(MP_QSTR_struct, (const byte*)"\x12\x90\x06" "struct")
-QDEF(MP_QSTR_ustruct, (const byte*)"\x47\x08\x07" "ustruct")
+QDEF(MP_QSTR_str, (const byte*)"\x50\x8d\x03" "str")
+QDEF(MP_QSTR_bytes, (const byte*)"\x5c\xb2\x05" "bytes")
+QDEF(MP_QSTR_tuple, (const byte*)"\xfd\x41\x05" "tuple")
+QDEF(MP_QSTR___str__, (const byte*)"\xd0\xcd\x07" "__str__")
+QDEF(MP_QSTR___repr__, (const byte*)"\x10\x0b\x08" "__repr__")
+QDEF(MP_QSTR___new__, (const byte*)"\x79\x15\x07" "__new__")
+QDEF(MP_QSTR___bool__, (const byte*)"\x2b\x65\x08" "__bool__")
+QDEF(MP_QSTR___len__, (const byte*)"\xe2\xb0\x07" "__len__")
+QDEF(MP_QSTR___hash__, (const byte*)"\xf7\xc8\x08" "__hash__")
+QDEF(MP_QSTR___eq__, (const byte*)"\x71\x3e\x06" "__eq__")
+QDEF(MP_QSTR___add__, (const byte*)"\xc4\x82\x07" "__add__")
+QDEF(MP_QSTR___sub__, (const byte*)"\x21\x09\x07" "__sub__")
+QDEF(MP_QSTR___lt__, (const byte*)"\x5d\x68\x06" "__lt__")
+QDEF(MP_QSTR___gt__, (const byte*)"\xb6\x82\x06" "__gt__")
+QDEF(MP_QSTR___le__, (const byte*)"\xcc\x13\x06" "__le__")
+QDEF(MP_QSTR___ge__, (const byte*)"\xa7\x46\x06" "__ge__")
+QDEF(MP_QSTR___contains__, (const byte*)"\xc6\x5f\x0c" "__contains__")
+QDEF(MP_QSTR___getattr__, (const byte*)"\x40\xf8\x0b" "__getattr__")
+QDEF(MP_QSTR___call__, (const byte*)"\xa7\xf9\x08" "__call__")
+QDEF(MP_QSTR___iter__, (const byte*)"\xcf\x32\x08" "__iter__")
+QDEF(MP_QSTR_type, (const byte*)"\x9d\x7f\x04" "type")
+QDEF(MP_QSTR_staticmethod, (const byte*)"\x62\xaf\x0c" "staticmethod")
+QDEF(MP_QSTR_classmethod, (const byte*)"\xb4\x8c\x0b" "classmethod")
+QDEF(MP_QSTR_zip, (const byte*)"\xe6\xac\x03" "zip")
+QDEF(MP_QSTR___path__, (const byte*)"\xc8\x23\x08" "__path__")
+QDEF(MP_QSTR_sep, (const byte*)"\x23\x8f\x03" "sep")
+QDEF(MP_QSTR_end, (const byte*)"\x0a\x23\x03" "end")
+QDEF(MP_QSTR___build_class__, (const byte*)"\x42\x88\x0f" "__build_class__")
+QDEF(MP_QSTR___import__, (const byte*)"\x38\x3e\x0a" "__import__")
+QDEF(MP_QSTR_abs, (const byte*)"\x95\x32\x03" "abs")
+QDEF(MP_QSTR_all, (const byte*)"\x44\x33\x03" "all")
+QDEF(MP_QSTR_any, (const byte*)"\x13\x33\x03" "any")
+QDEF(MP_QSTR_bin, (const byte*)"\xe0\x48\x03" "bin")
+QDEF(MP_QSTR_callable, (const byte*)"\x0d\x70\x08" "callable")
+QDEF(MP_QSTR_chr, (const byte*)"\xdc\x4c\x03" "chr")
+QDEF(MP_QSTR_dir, (const byte*)"\xfa\x1e\x03" "dir")
+QDEF(MP_QSTR_divmod, (const byte*)"\xb8\x04\x06" "divmod")
+QDEF(MP_QSTR_eval, (const byte*)"\x9b\xa6\x04" "eval")
+QDEF(MP_QSTR_exec, (const byte*)"\x1e\xc0\x04" "exec")
+QDEF(MP_QSTR_getattr, (const byte*)"\xc0\x17\x07" "getattr")
+QDEF(MP_QSTR_setattr, (const byte*)"\xd4\xa8\x07" "setattr")
+QDEF(MP_QSTR_globals, (const byte*)"\x9d\x49\x07" "globals")
+QDEF(MP_QSTR_hasattr, (const byte*)"\x8c\xb0\x07" "hasattr")
+QDEF(MP_QSTR_hash, (const byte*)"\xb7\x70\x04" "hash")
+QDEF(MP_QSTR_hex, (const byte*)"\x70\x50\x03" "hex")
+QDEF(MP_QSTR_id, (const byte*)"\x28\x6f\x02" "id")
+QDEF(MP_QSTR_isinstance, (const byte*)"\xb6\xbe\x0a" "isinstance")
+QDEF(MP_QSTR_issubclass, (const byte*)"\xb5\x7f\x0a" "issubclass")
+QDEF(MP_QSTR_iter, (const byte*)"\x8f\x21\x04" "iter")
+QDEF(MP_QSTR_len, (const byte*)"\x62\x40\x03" "len")
+QDEF(MP_QSTR_locals, (const byte*)"\x3b\xa1\x06" "locals")
+QDEF(MP_QSTR_next, (const byte*)"\x42\x88\x04" "next")
+QDEF(MP_QSTR_oct, (const byte*)"\xfd\x5c\x03" "oct")
+QDEF(MP_QSTR_ord, (const byte*)"\x1c\x5e\x03" "ord")
+QDEF(MP_QSTR_pow, (const byte*)"\x2d\x73\x03" "pow")
+QDEF(MP_QSTR_print, (const byte*)"\x54\xc6\x05" "print")
+QDEF(MP_QSTR_repr, (const byte*)"\xd0\xf7\x04" "repr")
+QDEF(MP_QSTR_round, (const byte*)"\xe7\x25\x05" "round")
+QDEF(MP_QSTR_sorted, (const byte*)"\x5e\x15\x06" "sorted")
+QDEF(MP_QSTR_sum, (const byte*)"\x2e\x8d\x03" "sum")
+QDEF(MP_QSTR_calcsize, (const byte*)"\x4d\x38\x08" "calcsize")
 QDEF(MP_QSTR_pack, (const byte*)"\xbc\xd1\x04" "pack")
 QDEF(MP_QSTR_pack_into, (const byte*)"\x1f\xa9\x09" "pack_into")
 QDEF(MP_QSTR_unpack, (const byte*)"\x07\x3c\x06" "unpack")
 QDEF(MP_QSTR_unpack_from, (const byte*)"\x0e\x6d\x0b" "unpack_from")
-QDEF(MP_QSTR_calcsize, (const byte*)"\x4d\x38\x08" "calcsize")
-QDEF(MP_QSTR_umachine, (const byte*)"\x95\x7f\x08" "umachine")
+QDEF(MP_QSTR_path, (const byte*)"\x88\xce\x04" "path")
+QDEF(MP_QSTR_argv, (const byte*)"\xc7\xc6\x04" "argv")
+QDEF(MP_QSTR_version, (const byte*)"\xbf\xd3\x07" "version")
+QDEF(MP_QSTR_version_info, (const byte*)"\x6e\x0a\x0c" "version_info")
+QDEF(MP_QSTR_implementation, (const byte*)"\x17\x2d\x0e" "implementation")
+QDEF(MP_QSTR_byteorder, (const byte*)"\x61\x99\x09" "byteorder")
+QDEF(MP_QSTR_little, (const byte*)"\x89\x6a\x06" "little")
+QDEF(MP_QSTR_modules, (const byte*)"\xec\xd1\x07" "modules")
+QDEF(MP_QSTR_print_exception, (const byte*)"\x1c\x22\x0f" "print_exception")
+QDEF(MP_QSTR___exit__, (const byte*)"\x45\xf8\x08" "__exit__")
+QDEF(MP_QSTR___enter__, (const byte*)"\x6d\xba\x09" "__enter__")
 QDEF(MP_QSTR_mem, (const byte*)"\x20\x44\x03" "mem")
-QDEF(MP_QSTR_mem8, (const byte*)"\x18\xc8\x04" "mem8")
-QDEF(MP_QSTR_mem16, (const byte*)"\x07\xca\x05" "mem16")
-QDEF(MP_QSTR_mem32, (const byte*)"\x41\xca\x05" "mem32")
-QDEF(MP_QSTR_machine, (const byte*)"\x60\xab\x07" "machine")
-QDEF(MP_QSTR_reset, (const byte*)"\x10\xf4\x05" "reset")
-QDEF(MP_QSTR_mbed, (const byte*)"\x0b\xb5\x04" "mbed")
-QDEF(MP_QSTR_DigitalOut, (const byte*)"\x11\xcb\x0a" "DigitalOut")

--- a/modmachine.c	Sat Apr 16 17:11:56 2016 +0000
+++ b/modmachine.c	Sat Apr 16 22:42:43 2016 +0100
@@ -33,7 +33,10 @@
 
 #if MICROPY_PY_MACHINE
 
+// Don't try to include mbed-specific files if proprocessing qstr
+#if __MBED__
 #include "cmsis.h"
+#endif
 
 /** \brief Reset the board.
  *