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

Merge pull request #546 from stinos/relax-makeqstrdata

More relaxed parsing of preprocessed qstr header
parents 5874c1c9 1dc7f042
......@@ -29,43 +29,15 @@ def compute_hash(qstr):
hash = (hash * 33) ^ ord(char)
return hash & 0xffff
# given a list of (name,regex) pairs, find the first one that matches the given line
def re_match_first(regexs, line):
for name, regex in regexs:
match = re.match(regex, line)
if match:
return name, match
return None, None
# regexs to recognise lines that the CPP emits
# use a list so that matching order is honoured
cpp_regexs = [
('qstr', r'Q\((.+)\)$'),
('cdecl', r'(typedef|extern) [A-Za-z0-9_* ]+;$')
def do_work(infiles):
# read the qstrs in from the input files
qstrs = {}
for infile in infiles:
with open(infile, 'rt') as f:
line_number = 0
for line in f:
line_number += 1
line = line.strip()
# ignore blank lines, comments and preprocessor directives
if len(line) == 0 or line.startswith('//') or line.startswith('#'):
# work out what kind of line it is
match_kind, match = re_match_first(cpp_regexs, line)
if match_kind is None:
# unknown line format
print('({}:{}) bad qstr format, got {}'.format(infile, line_number, line), file=sys.stderr)
return False
elif match_kind != 'qstr':
# not a line with a qstr
# is this a QSTR line?
match = re.match(r'^Q\((.+)\)$', line.strip())
if not match:
# get the qstr value
Supports Markdown
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