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

Update filter and handle nested quotes

Browse Source
This commit is contained in:
Scott Shawcroft 2018-08-09 14:16:28 -07:00
parent 3123cc69c4
commit 1835f1ab14
No known key found for this signature in database
GPG Key ID: FD0EDC4B6C53CA59
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
py/makeqstrdefs.py
View File

@ -75,6 +75,7 @@ def qstr_unescape(qstr):
def process_file(f): def process_file(f):
re_line = re.compile(r"#[line]*\s(\d+)\s\"([^\"]+)\"") re_line = re.compile(r"#[line]*\s(\d+)\s\"([^\"]+)\"")
re_qstr = re.compile(r'MP_QSTR_[_a-zA-Z0-9]+') re_qstr = re.compile(r'MP_QSTR_[_a-zA-Z0-9]+')
re_translate = re.compile(r'translate\(\"((?:(?=(\\?))\2.)*?)\"\)')
output = [] output = []
last_fname = None last_fname = None
lineno = 0 lineno = 0
@ -99,8 +100,8 @@ def process_file(f):
name = match.replace('MP_QSTR_', '') name = match.replace('MP_QSTR_', '')
if name not in QSTRING_BLACK_LIST: if name not in QSTRING_BLACK_LIST:
output.append('Q(' + qstr_unescape(name) + ')') output.append('Q(' + qstr_unescape(name) + ')')
for match in re.findall(r'translate\(\"([^\"]+)\"\)', line): for match in re_translate.findall(line):
output.append('TRANSLATE("' + match + '")') output.append('TRANSLATE("' + match[0] + '")')
lineno += 1 lineno += 1
write_out(last_fname, output) write_out(last_fname, output)

2
py/mkrules.mk
View File

@ -79,7 +79,7 @@ $(OBJ): | $(HEADER_BUILD)/qstrdefs.enum.h $(HEADER_BUILD)/mpversion.h
# - else, process all source files ($^) [this covers "make -B" which can set $? to empty] # - else, process all source files ($^) [this covers "make -B" which can set $? to empty]
$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(SRC_QSTR_PREPROCESSOR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER_BUILD)/mpversion.h $(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(SRC_QSTR_PREPROCESSOR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER_BUILD)/mpversion.h
$(STEPECHO) "GEN $@" $(STEPECHO) "GEN $@"
$(Q)grep -lE "(MP_QSTR|i18n)" $(if $(filter $?,$(QSTR_GLOBAL_DEPENDENCIES)),$^,$(if $?,$?,$^)) | xargs $(CPP) $(QSTR_GEN_EXTRA_CFLAGS) $(CFLAGS) $(SRC_QSTR_PREPROCESSOR) >$(HEADER_BUILD)/qstr.i.last; $(Q)grep -lE "(MP_QSTR|translate)" $(if $(filter $?,$(QSTR_GLOBAL_DEPENDENCIES)),$^,$(if $?,$?,$^)) | xargs $(CPP) $(QSTR_GEN_EXTRA_CFLAGS) $(CFLAGS) $(SRC_QSTR_PREPROCESSOR) >$(HEADER_BUILD)/qstr.i.last;
$(HEADER_BUILD)/qstr.split: $(HEADER_BUILD)/qstr.i.last $(PY_SRC)/makeqstrdefs.py $(HEADER_BUILD)/qstr.split: $(HEADER_BUILD)/qstr.i.last $(PY_SRC)/makeqstrdefs.py
$(STEPECHO) "GEN $@" $(STEPECHO) "GEN $@"