Skip to content

Commit 9ddbe29

Browse files
dpgeorgedpgeorge
committed
py: Add include guards to mpconfig,misc,qstr,obj,runtime,parsehelper.
1 parent f89d659 commit 9ddbe29

9 files changed

Lines changed: 37 additions & 15 deletions

File tree

‎esp8266/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ CROSS_COMPILE = xtensa-lx106-elf-
1111
ESP_SDK = $(shell $(CC) -print-sysroot)/usr
1212

1313
INC = -I.
14+
INC += -I..
1415
INC += -I$(PY_SRC)
1516
INC += -I../stmhal
1617
INC += -I$(BUILD)

‎py/misc.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2424
* THE SOFTWARE.
2525
*/
26+
#ifndef __MICROPY_INCLUDED_PY_MISC_H__
27+
#define __MICROPY_INCLUDED_PY_MISC_H__
2628

2729
// a mini library of useful types and functions
2830

29-
#ifndef _INCLUDED_MINILIB_H
30-
#define _INCLUDED_MINILIB_H
31-
3231
/** types *******************************************************/
3332

3433
#include <stdbool.h>
@@ -185,4 +184,4 @@ static inline mp_uint_t count_lead_ones(byte val) {
185184
}
186185
#endif
187186

188-
#endif // _INCLUDED_MINILIB_H
187+
#endif // __MICROPY_INCLUDED_PY_MISC_H__

‎py/mpconfig.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2424
* THE SOFTWARE.
2525
*/
26+
#ifndef __MICROPY_INCLUDED_PY_MPCONFIG_H__
27+
#define __MICROPY_INCLUDED_PY_MPCONFIG_H__
2628

2729
// This file contains default configuration settings for MicroPython.
2830
// You can override any of the options below using mpconfigport.h file
@@ -572,3 +574,5 @@ typedef double mp_float_t;
572574
#ifndef MP_UNLIKELY
573575
#define MP_UNLIKELY(x) __builtin_expect((x), 0)
574576
#endif
577+
578+
#endif // __MICROPY_INCLUDED_PY_MPCONFIG_H__

‎py/obj.h‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2424
* THE SOFTWARE.
2525
*/
26+
#ifndef __MICROPY_INCLUDED_PY_OBJ_H__
27+
#define __MICROPY_INCLUDED_PY_OBJ_H__
28+
29+
#include "py/mpconfig.h"
30+
#include "py/misc.h"
31+
#include "py/qstr.h"
2632

2733
// A Micro Python object is a machine word having the following form:
2834
// - xxxx...xxx1 : a small int, bits 1 and above are the value
@@ -81,7 +87,7 @@ typedef struct _mp_obj_base_t mp_obj_base_t;
8187
#define MP_OBJ_NEW_SMALL_INT(small_int) ((mp_obj_t)((((mp_int_t)(small_int)) << 1) | 1))
8288

8389
#define MP_OBJ_QSTR_VALUE(o) (((mp_int_t)(o)) >> 2)
84-
#define MP_OBJ_NEW_QSTR(qstr) ((mp_obj_t)((((mp_uint_t)(qstr)) << 2) | 2))
90+
#define MP_OBJ_NEW_QSTR(qst) ((mp_obj_t)((((mp_uint_t)(qst)) << 2) | 2))
8591

8692
// These macros are used to declare and define constant function objects
8793
// You can put "static" in front of the definitions to make them local
@@ -620,3 +626,5 @@ mp_obj_t mp_seq_extract_slice(mp_uint_t len, const mp_obj_t *seq, mp_bound_slice
620626
/*printf("memmove(%p, %p, %d)\n", dest + beg + len_adj, dest + beg, (dest_len - beg) * sizeof(item_t));*/ \
621627
memmove(dest + beg + len_adj, dest + beg, (dest_len - beg) * sizeof(item_t)); \
622628
memcpy(dest + beg, slice, slice_len * sizeof(item_t));
629+
630+
#endif // __MICROPY_INCLUDED_PY_OBJ_H__

‎py/parsehelper.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2424
* THE SOFTWARE.
2525
*/
26+
#ifndef __MICROPY_INCLUDED_PY_PARSEHELPER_H__
27+
#define __MICROPY_INCLUDED_PY_PARSEHELPER_H__
28+
29+
#include "py/lexer.h"
30+
#include "py/parse.h"
2631

2732
void mp_parse_show_exception(mp_lexer_t *lex, mp_parse_error_kind_t parse_error_kind);
2833
mp_obj_t mp_parse_make_exception(mp_lexer_t *lex, mp_parse_error_kind_t parse_error_kind);
34+
35+
#endif // __MICROPY_INCLUDED_PY_PARSEHELPER_H__

‎py/qstr.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2424
* THE SOFTWARE.
2525
*/
26+
#ifndef __MICROPY_INCLUDED_PY_QSTR_H__
27+
#define __MICROPY_INCLUDED_PY_QSTR_H__
28+
29+
#include "py/mpconfig.h"
30+
#include "py/misc.h"
2631

2732
// See qstrdefs.h for a list of qstr's that are available as constants.
2833
// Reference them as MP_QSTR_xxxx.
@@ -60,3 +65,5 @@ mp_uint_t qstr_len(qstr q);
6065
const byte* qstr_data(qstr q, mp_uint_t *len);
6166

6267
void qstr_pool_info(mp_uint_t *n_pool, mp_uint_t *n_qstr, mp_uint_t *n_str_data_bytes, mp_uint_t *n_total_bytes);
68+
69+
#endif // __MICROPY_INCLUDED_PY_QSTR_H__

‎py/runtime.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2424
* THE SOFTWARE.
2525
*/
26+
#ifndef __MICROPY_INCLUDED_PY_RUNTIME_H__
27+
#define __MICROPY_INCLUDED_PY_RUNTIME_H__
28+
29+
#include "py/obj.h"
2630

2731
typedef enum {
2832
MP_VM_RETURN_NORMAL,
@@ -120,3 +124,5 @@ extern struct _mp_obj_list_t mp_sys_path_obj;
120124
extern struct _mp_obj_list_t mp_sys_argv_obj;
121125
#define mp_sys_path ((mp_obj_t)&mp_sys_path_obj)
122126
#define mp_sys_argv ((mp_obj_t)&mp_sys_argv_obj)
127+
128+
#endif // __MICROPY_INCLUDED_PY_RUNTIME_H__

‎stmhal/pyexec.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030

3131
#include "mpconfig.h"
3232
#include "nlr.h"
33-
#include "misc.h"
34-
#include "qstr.h"
35-
#include "misc.h"
36-
#include "lexer.h"
37-
#include "parse.h"
3833
#include "obj.h"
3934
#include "parsehelper.h"
4035
#include "compile.h"

‎unix/main.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737

3838
#include "mpconfig.h"
3939
#include "nlr.h"
40-
#include "misc.h"
41-
#include "qstr.h"
42-
#include "lexer.h"
43-
#include "lexerunix.h"
44-
#include "parse.h"
4540
#include "obj.h"
4641
#include "parsehelper.h"
4742
#include "compile.h"

0 commit comments

Comments
 (0)