The complex struct_members regex was defined far from its use; bring the two together. Remove some extraneous backslashes while making the move.
Unified · Split
| @@ -551,7 +551,6 @@ class KernelDoc: · 550 unmodified lines | ||
| 551 | 551 | ] |
| 552 | 552 | |
| 553 | 553 | definition_body = r'\{(.*)\}\s*' + "(?:" + '|'.join(qualifiers) + ")?" |
| 554 | − struct_members = KernRe(type_pattern + r'([^\{\};]+)(\{)([^\{\}]*)(\})([^\{\}\;]*)(\;)') | |
| 555 | 554 | |
| 556 | 555 | # Extract struct/union definition |
| 557 | 556 | members = None |
| @@ -683,6 +682,7 @@ class KernelDoc: · 125 unmodified lines | ||
| 683 | 682 | # So, we need to have an extra loop on Python to override such |
| 684 | 683 | # re limitation. |
| 685 | 684 | |
| 685 | + struct_members = KernRe(type_pattern + r'([^\{\};]+)(\{)([^\{\}]*)(\})([^\{\};]*)(;)') | |
| 686 | 686 | while True: |
| 687 | 687 | tuples = struct_members.findall(members) |
| 688 | 688 | if not tuples: |