generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Teach mkdef.pl to handle multiline declarations.

Browse Source 
For the moment, this is specially crafted for DECLARE_DEPRECATED because
that's where we found the problem, but it can easily be expanded to other
types of special delarations when needed.

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte 2015-03-24 15:02:51 +01:00
parent e5991ec528
commit fa327fafe2
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/mkdef.pl
View File

@ -487,7 +487,14 @@ sub do_defs
while(<IN>) { while(<IN>) {
if($parens > 0) { if($parens > 0) {
#Inside a DECLARE_DEPRECATED #Inside a DECLARE_DEPRECATED
$parens += count_parens($_); $stored_multiline .= $_;
chomp $stored_multiline;
print STDERR "DEBUG: Continuing multiline DEPRECATED: $stored_multiline\n" if $debug;
$parens = count_parens($stored_multiline);
if ($parens == 0) {
$stored_multiline =~ /^\s*DECLARE_DEPRECATED\s*\(\s*(\w*(\s|\*|\w)*)/;
$def .= "$1(void);";
}
next; next;
} }
if (/\/\* Error codes for the \w+ functions\. \*\//) if (/\/\* Error codes for the \w+ functions\. \*\//)
@ -881,9 +888,15 @@ sub do_defs
"EXPORT_VAR_AS_FUNCTION", "EXPORT_VAR_AS_FUNCTION",
"FUNCTION"); "FUNCTION");
} elsif (/^\s*DECLARE_DEPRECATED\s*\(\s*(\w*(\s|\*|\w)*)/) { } elsif (/^\s*DECLARE_DEPRECATED\s*\(\s*(\w*(\s|\*|\w)*)/) {
$def .= "$1(void);";
$parens = count_parens($_); $parens = count_parens($_);
if ($parens == 0) {
$def .= "$1(void);";
} else {
$stored_multiline = $_;
chomp $stored_multiline;
print STDERR "DEBUG: Found multiline DEPRECATED starting with: $stored_multiline\n" if $debug;
next; next;
}
} elsif ($tag{'CONST_STRICT'} != 1) { } elsif ($tag{'CONST_STRICT'} != 1) {
if (/\{|\/\*|\([^\)]*$/) { if (/\{|\/\*|\([^\)]*$/) {
$line = $_; $line = $_;