|
20 | 20 | from datetime import datetime |
21 | 21 |
|
22 | 22 | from kdoc_parser import KernelDoc, type_param |
23 | | -from kdoc_re import Re |
| 23 | +from kdoc_re import KernRe |
24 | 24 |
|
25 | 25 |
|
26 | | -function_pointer = Re(r"([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)", cache=False) |
| 26 | +function_pointer = KernRe(r"([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)", cache=False) |
27 | 27 |
|
28 | 28 | # match expressions used to find embedded type information |
29 | | -type_constant = Re(r"\b``([^\`]+)``\b", cache=False) |
30 | | -type_constant2 = Re(r"\%([-_*\w]+)", cache=False) |
31 | | -type_func = Re(r"(\w+)\(\)", cache=False) |
32 | | -type_param_ref = Re(r"([\!~\*]?)\@(\w*((\.\w+)|(->\w+))*(\.\.\.)?)", cache=False) |
| 29 | +type_constant = KernRe(r"\b``([^\`]+)``\b", cache=False) |
| 30 | +type_constant2 = KernRe(r"\%([-_*\w]+)", cache=False) |
| 31 | +type_func = KernRe(r"(\w+)\(\)", cache=False) |
| 32 | +type_param_ref = KernRe(r"([\!~\*]?)\@(\w*((\.\w+)|(->\w+))*(\.\.\.)?)", cache=False) |
33 | 33 |
|
34 | 34 | # Special RST handling for func ptr params |
35 | | -type_fp_param = Re(r"\@(\w+)\(\)", cache=False) |
| 35 | +type_fp_param = KernRe(r"\@(\w+)\(\)", cache=False) |
36 | 36 |
|
37 | 37 | # Special RST handling for structs with func ptr params |
38 | | -type_fp_param2 = Re(r"\@(\w+->\S+)\(\)", cache=False) |
| 38 | +type_fp_param2 = KernRe(r"\@(\w+->\S+)\(\)", cache=False) |
39 | 39 |
|
40 | | -type_env = Re(r"(\$\w+)", cache=False) |
41 | | -type_enum = Re(r"\&(enum\s*([_\w]+))", cache=False) |
42 | | -type_struct = Re(r"\&(struct\s*([_\w]+))", cache=False) |
43 | | -type_typedef = Re(r"\&(typedef\s*([_\w]+))", cache=False) |
44 | | -type_union = Re(r"\&(union\s*([_\w]+))", cache=False) |
45 | | -type_member = Re(r"\&([_\w]+)(\.|->)([_\w]+)", cache=False) |
46 | | -type_fallback = Re(r"\&([_\w]+)", cache=False) |
47 | | -type_member_func = type_member + Re(r"\(\)", cache=False) |
| 40 | +type_env = KernRe(r"(\$\w+)", cache=False) |
| 41 | +type_enum = KernRe(r"\&(enum\s*([_\w]+))", cache=False) |
| 42 | +type_struct = KernRe(r"\&(struct\s*([_\w]+))", cache=False) |
| 43 | +type_typedef = KernRe(r"\&(typedef\s*([_\w]+))", cache=False) |
| 44 | +type_union = KernRe(r"\&(union\s*([_\w]+))", cache=False) |
| 45 | +type_member = KernRe(r"\&([_\w]+)(\.|->)([_\w]+)", cache=False) |
| 46 | +type_fallback = KernRe(r"\&([_\w]+)", cache=False) |
| 47 | +type_member_func = type_member + KernRe(r"\(\)", cache=False) |
48 | 48 |
|
49 | 49 |
|
50 | 50 | class OutputFormat: |
@@ -257,8 +257,8 @@ class RestFormat(OutputFormat): |
257 | 257 | ] |
258 | 258 | blankline = "\n" |
259 | 259 |
|
260 | | - sphinx_literal = Re(r'^[^.].*::$', cache=False) |
261 | | - sphinx_cblock = Re(r'^\.\.\ +code-block::', cache=False) |
| 260 | + sphinx_literal = KernRe(r'^[^.].*::$', cache=False) |
| 261 | + sphinx_cblock = KernRe(r'^\.\.\ +code-block::', cache=False) |
262 | 262 |
|
263 | 263 | def __init__(self): |
264 | 264 | """ |
@@ -299,14 +299,14 @@ def output_highlight(self, args): |
299 | 299 | # If this is the first non-blank line in a literal block, |
300 | 300 | # figure out the proper indent. |
301 | 301 | if not litprefix: |
302 | | - r = Re(r'^(\s*)') |
| 302 | + r = KernRe(r'^(\s*)') |
303 | 303 | if r.match(line): |
304 | 304 | litprefix = '^' + r.group(1) |
305 | 305 | else: |
306 | 306 | litprefix = "" |
307 | 307 |
|
308 | 308 | output += line + "\n" |
309 | | - elif not Re(litprefix).match(line): |
| 309 | + elif not KernRe(litprefix).match(line): |
310 | 310 | in_literal = False |
311 | 311 | else: |
312 | 312 | output += line + "\n" |
@@ -429,7 +429,7 @@ def out_function(self, fname, name, args): |
429 | 429 | self.data += f"{self.lineprefix}**Parameters**\n\n" |
430 | 430 |
|
431 | 431 | for parameter in parameterlist: |
432 | | - parameter_name = Re(r'\[.*').sub('', parameter) |
| 432 | + parameter_name = KernRe(r'\[.*').sub('', parameter) |
433 | 433 | dtype = args['parametertypes'].get(parameter, "") |
434 | 434 |
|
435 | 435 | if dtype: |
@@ -626,7 +626,7 @@ def output_highlight(self, block): |
626 | 626 | contents = "\n".join(contents) |
627 | 627 |
|
628 | 628 | for line in contents.strip("\n").split("\n"): |
629 | | - line = Re(r"^\s*").sub("", line) |
| 629 | + line = KernRe(r"^\s*").sub("", line) |
630 | 630 | if not line: |
631 | 631 | continue |
632 | 632 |
|
@@ -680,7 +680,7 @@ def out_function(self, fname, name, args): |
680 | 680 | # Pointer-to-function |
681 | 681 | self.data += f'".BI "{parenth}{function_pointer.group(1)}" " ") ({function_pointer.group(2)}){post}"' + "\n" |
682 | 682 | else: |
683 | | - dtype = Re(r'([^\*])$').sub(r'\1 ', dtype) |
| 683 | + dtype = KernRe(r'([^\*])$').sub(r'\1 ', dtype) |
684 | 684 |
|
685 | 685 | self.data += f'.BI "{parenth}{dtype}" "{post}"' + "\n" |
686 | 686 | count += 1 |
@@ -727,7 +727,7 @@ def out_enum(self, fname, name, args): |
727 | 727 | self.data += ".SH Constants\n" |
728 | 728 |
|
729 | 729 | for parameter in parameterlist: |
730 | | - parameter_name = Re(r'\[.*').sub('', parameter) |
| 730 | + parameter_name = KernRe(r'\[.*').sub('', parameter) |
731 | 731 | self.data += f'.IP "{parameter}" 12' + "\n" |
732 | 732 | self.output_highlight(args['parameterdescs'].get(parameter_name, "")) |
733 | 733 |
|
@@ -769,7 +769,7 @@ def out_struct(self, fname, name, args): |
769 | 769 |
|
770 | 770 | # Replace tabs with two spaces and handle newlines |
771 | 771 | declaration = definition.replace("\t", " ") |
772 | | - declaration = Re(r"\n").sub('"\n.br\n.BI "', declaration) |
| 772 | + declaration = KernRe(r"\n").sub('"\n.br\n.BI "', declaration) |
773 | 773 |
|
774 | 774 | self.data += ".SH SYNOPSIS\n" |
775 | 775 | self.data += f"{struct_type} {struct_name} " + "{" + "\n.br\n" |
|
0 commit comments