Commit df6567e6 authored by Damien George's avatar Damien George
Browse files

Merge map.h into obj.h.

Pretty much everyone needs to include map.h, since it's such an integral
part of the Micro Python object implementation.  Thus, the definitions
are now in obj.h instead.  map.h is removed.
parent d17926db
......@@ -6,7 +6,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "runtime0.h"
#include "runtime.h"
#include "objtuple.h"
......
......@@ -6,7 +6,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "runtime0.h"
#include "runtime.h"
......
......@@ -12,7 +12,6 @@
#include "runtime0.h"
#include "runtime.h"
#include "emitglue.h"
#include "map.h"
#include "builtin.h"
#include "builtintables.h"
#include "bc.h"
......
......@@ -3,10 +3,10 @@ void mp_deinit(void);
void mp_check_nargs(int n_args, machine_uint_t n_args_min, machine_uint_t n_args_max, int n_kw, bool is_kw);
struct _mp_map_t *mp_locals_get(void);
void mp_locals_set(struct _mp_map_t *m);
struct _mp_map_t *mp_globals_get(void);
void mp_globals_set(struct _mp_map_t *m);
mp_map_t *mp_locals_get(void);
void mp_locals_set(mp_map_t *m);
mp_map_t *mp_globals_get(void);
void mp_globals_set(mp_map_t *m);
mp_obj_t mp_load_name(qstr qstr);
mp_obj_t mp_load_global(qstr qstr);
......@@ -58,7 +58,7 @@ mp_obj_t mp_iternext(mp_obj_t o); // will always return MP_OBJ_NULL instead of r
mp_obj_t mp_make_raise_obj(mp_obj_t o);
extern mp_obj_t mp_sys_path;
struct _mp_map_t *mp_loaded_modules_get(void);
mp_map_t *mp_loaded_modules_get(void);
mp_obj_t mp_import_name(qstr name, mp_obj_t fromlist, mp_obj_t level);
mp_obj_t mp_import_from(mp_obj_t module, qstr name);
void mp_import_all(mp_obj_t module);
......@@ -6,7 +6,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "runtime0.h"
#include "runtime.h"
......
......@@ -6,7 +6,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "adc.h"
/* ADC defintions */
......
......@@ -9,7 +9,6 @@
#include "qstr.h"
#include "parse.h"
#include "obj.h"
#include "map.h"
#include "runtime.h"
#include "audio.h"
......
......@@ -9,7 +9,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "runtime.h"
#include "nlr.h"
......
......@@ -5,7 +5,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "file.h"
#include "ff.h"
......
......@@ -7,7 +7,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
typedef enum {
PYB_I2C_1 = 0,
......
......@@ -6,7 +6,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "led.h"
#include "pin.h"
#include "build/pins.h"
......
......@@ -7,7 +7,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "pin.h"
......
......@@ -9,7 +9,6 @@
#include "obj.h"
#include "runtime.h"
#include "nlr.h"
#include "map.h"
#include "pin.h"
......
......@@ -9,7 +9,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "gc.h"
#include "gccollect.h"
#include "systick.h"
......
......@@ -21,7 +21,6 @@
#include "lexer.h"
#include "parse.h"
#include "obj.h"
#include "map.h"
#include "runtime.h"
#include "cc3k/ccspi.h"
......
......@@ -9,7 +9,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "runtime.h"
#include "sdcard.h"
......
......@@ -8,7 +8,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "servo.h"
// PWM
......
......@@ -7,7 +7,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "usart.h"
pyb_usart_t pyb_usart_global_debug = PYB_USART_NONE;
......
......@@ -8,7 +8,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "runtime.h"
#include "i2c.h"
#include "accel.h"
......
......@@ -7,7 +7,6 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
#include "map.h"
#include "runtime.h"
#include "adc.h"
#include "pin.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment