djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modure: Make sure that re1.5 compiled in only of modure itself is enabled.

Browse Source 
This is achieved by including re1.5 *.c files straight from modure.c .
This commit is contained in:
Paul Sokolovsky 2014-10-12 03:12:58 +03:00
parent 457c0a606c
commit 1606607bd4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extmod/modure.c
View File

@ -238,4 +238,12 @@ const mp_obj_module_t mp_module_ure = {
.globals = (mp_obj_dict_t*)&mp_module_re_globals, .globals = (mp_obj_dict_t*)&mp_module_re_globals,
}; };
// Source files #include'd here to make sure they're compiled in
// only if module is enabled by config setting.
#define re1_5_fatal(x) assert(!x)
#include "re1.5/compilecode.c"
#include "re1.5/dumpcode.c"
#include "re1.5/recursiveloop.c"
#endif //MICROPY_PY_URE #endif //MICROPY_PY_URE

7
py/py.mk
View File

@ -114,9 +114,6 @@ PY_O_BASENAME = \
../extmod/modzlibd.o \ ../extmod/modzlibd.o \
../extmod/modujson.o \ ../extmod/modujson.o \
../extmod/modure.o \ ../extmod/modure.o \
../extmod/re1.5/compilecode.o \
../extmod/re1.5/dumpcode.o \
../extmod/re1.5/recursiveloop.o \
# prepend the build destination prefix to the py object files # prepend the build destination prefix to the py object files
PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME)) PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME))
@ -169,7 +166,3 @@ $(PY_BUILD)/gc.o: CFLAGS += $(CSUPEROPT)
# optimising vm for speed, adds only a small amount to code size but makes a huge difference to speed (20% faster) # optimising vm for speed, adds only a small amount to code size but makes a huge difference to speed (20% faster)
$(PY_BUILD)/vm.o: CFLAGS += $(CSUPEROPT) $(PY_BUILD)/vm.o: CFLAGS += $(CSUPEROPT)
# Additional options for 3rd-party libs
$(PY_BUILD)/../extmod/re1.5/recursiveloop.o: CFLAGS += "-Dre1_5_fatal(x)=assert(!x)"