system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 17:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

winapi: Fix a few C parser bugs.

Browse source
This commit is contained in:
Alexandre Julliard 2010-06-07 16:46:44 +02:00
parent 84ff0631d4
commit e1fd4390bf
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/winapi/c_parser.pm
View file

@ -513,6 +513,12 @@ sub parse_c_declaration($$$$)
if(s/\)//) {
$column++;
}
} elsif(s/^__ASM_STDCALL_FUNC\(\s*(\w+)\s*,\s*\d+\s*,\s*//s) { # FIXME: Wine specific kludge
$self->_update_c_position($&, \$line, \$column);
$self->_parse_c_until_one_of("\)", \$_, \$line, \$column);
if(s/\)//) {
$column++;
}
} elsif(s/^(?:DEFINE_AVIGUID|DEFINE_OLEGUID)\s*(?=\()//s) { # FIXME: Wine specific kludge
$self->_update_c_position($&, \$line, \$column);
@ -934,7 +940,7 @@ sub parse_c_file($$$$)
$self->_parse_c_error($_, $line, $column, "file", ") without (");
}
$declaration .= $&;
if($plevel == 1 && $declaration =~ /^__ASM_GLOBAL_FUNC/) {
if($plevel == 1 && $declaration =~ /^(__ASM_GLOBAL_FUNC|__ASM_STDCALL_FUNC)/) {
if(!$self->parse_c_declaration(\$declaration, \$declaration_line, \$declaration_column)) {
return 0;
}
@ -1390,11 +1396,11 @@ sub parse_c_struct_union($$$$$$$$$)
$self->_parse_c_until_one_of("\\S", \$_, \$line, \$column);
if (!s/^(interface|struct|union)\s+((?:MSVCRT|WS)\(\s*\w+\s*\)|\w+)?\s*\{\s*//s) {
if (!s/^(interface|struct|union)(\s+((?:MSVCRT|WS)\(\s*\w+\s*\)|\w+))?\s*\{\s*//s) {
return 0;
}
$kind = $1;
$_name = $2 || "";
$_name = $3 || "";
$self->_update_c_position($&, \$line, \$column);