mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

decodetree: Implement non-overlapping groups

Browse Source 
Intended to be nested within overlapping groups.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2020-05-18 08:45:32 -07:00
parent 08561fc128
commit 067e8b0f45
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/decodetree.py
View File

@ -1021,16 +1021,20 @@ def parse_file(f, parent_pat):
del toks[0] del toks[0]
# End nesting? # End nesting?
if name == '}': if name == '}' or name == ']':
if len(toks) != 0: if len(toks) != 0:
error(start_lineno, 'extra tokens after close brace') error(start_lineno, 'extra tokens after close brace')
if len(parent_pat.pats) < 2: if len(parent_pat.pats) < 2:
error(lineno, 'less than two patterns within braces') error(lineno, 'less than two patterns within braces')
# Make sure { } and [ ] nest properly.
if (name == '}') != isinstance(parent_pat, IncMultiPattern):
error(lineno, 'mismatched close brace')
try: try:
parent_pat = nesting_pats.pop() parent_pat = nesting_pats.pop()
except: except:
error(lineno, 'mismatched close brace') error(lineno, 'extra close brace')
nesting -= 2 nesting -= 2
if indent != nesting: if indent != nesting:
@ -1044,11 +1048,14 @@ def parse_file(f, parent_pat):
error(start_lineno, 'indentation ', indent, ' != ', nesting) error(start_lineno, 'indentation ', indent, ' != ', nesting)
# Start nesting? # Start nesting?
if name == '{': if name == '{' or name == '[':
if len(toks) != 0: if len(toks) != 0:
error(start_lineno, 'extra tokens after open brace') error(start_lineno, 'extra tokens after open brace')
nested_pat = IncMultiPattern(start_lineno) if name == '{':
nested_pat = IncMultiPattern(start_lineno)
else:
nested_pat = ExcMultiPattern(start_lineno)
parent_pat.pats.append(nested_pat) parent_pat.pats.append(nested_pat)
nesting_pats.append(parent_pat) nesting_pats.append(parent_pat)
parent_pat = nested_pat parent_pat = nested_pat
@ -1067,6 +1074,9 @@ def parse_file(f, parent_pat):
else: else:
parse_generic(start_lineno, parent_pat, name, toks) parse_generic(start_lineno, parent_pat, name, toks)
toks = [] toks = []
if nesting != 0:
error(lineno, 'missing close brace')
# end parse_file # end parse_file