diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-07 12:06:05 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-07 12:08:32 +0200 |
| commit | 9c80c74563bceede4057bb93dbb21c84f56f5858 (patch) | |
| tree | c8fc7ba097a5e7abf850b79d02d2b1267e5f01b6 /Documentation/sphinx | |
| parent | doc-rst: fix parsing comments and '{' on a separate line (diff) | |
| download | linux-9c80c74563bceede4057bb93dbb21c84f56f5858.tar.xz linux-9c80c74563bceede4057bb93dbb21c84f56f5858.zip | |
doc-rst: parse-headers: be more formal about the valid symbols
Be more formal about the valid symbols that are expected by
the parser, to match what c language expects.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/sphinx')
| -rwxr-xr-x | Documentation/sphinx/parse-headers.pl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/sphinx/parse-headers.pl b/Documentation/sphinx/parse-headers.pl index bf6f0df895f4..5e366756084f 100755 --- a/Documentation/sphinx/parse-headers.pl +++ b/Documentation/sphinx/parse-headers.pl @@ -34,7 +34,7 @@ while (<IN>) { $data .= $_; - if ($is_enum && $ln =~ m/^\s*([_A-Z][^\s\}\,\=]+)\s*[\,=]?/) { + if ($is_enum && $ln =~ m/^\s*([_\w][\w\d_]+)\s*[\,=]?/) { my $s = $1; my $n = $1; $n =~ tr/A-Z/a-z/; @@ -47,7 +47,7 @@ while (<IN>) { } $is_enum = 0 if ($is_enum && m/\}/); - if ($ln =~ m/^\s*#\s*define\s+([_A-Z]\S+)\s+_IO/) { + if ($ln =~ m/^\s*#\s*define\s+([_\w][\w\d_]+)\s+_IO/) { my $s = $1; my $n = $1; $n =~ tr/A-Z/a-z/; @@ -56,7 +56,7 @@ while (<IN>) { next; } - if ($ln =~ m/^\s*#\s*define\s+([_A-Z]\S+)\s+/) { + if ($ln =~ m/^\s*#\s*define\s+([_\w][\w\d_]+)\s+/) { my $s = $1; my $n = $1; $n =~ tr/A-Z/a-z/; @@ -66,7 +66,7 @@ while (<IN>) { next; } - if ($ln =~ m/^\s*typedef\s+.*\s+([_\w]\S+);/) { + if ($ln =~ m/^\s*typedef\s+.*\s+([_\w][\w\d_]+);/) { my $s = $1; my $n = $1; $n =~ tr/A-Z/a-z/; @@ -75,8 +75,8 @@ while (<IN>) { $typedefs{$s} = $n; next; } - if ($ln =~ m/^\s*enum\s+(\S+)\s+\{/ - || $ln =~ m/^\s*enum\s+(\S+)$/) { + if ($ln =~ m/^\s*enum\s+([_\w][\w\d_]+)\s+\{/ + || $ln =~ m/^\s*enum\s+([_\w][\w\d_]+)$/) { my $s = $1; my $n = $1; $n =~ tr/A-Z/a-z/; @@ -87,8 +87,8 @@ while (<IN>) { $is_enum = $1; next; } - if ($ln =~ m/^\s*struct\s+([_A-Za-z_]\S+)\s+\{/ - || $ln =~ m/^\s*struct\s+([A-Za-z_]\S+)$/) { + if ($ln =~ m/^\s*struct\s+([_\w][\w\d_]+)\s+\{/ + || $ln =~ m/^\s*struct\s+([[_\w][\w\d_]+)$/) { my $s = $1; my $n = $1; $n =~ tr/A-Z/a-z/; |