system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-01 18:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

widl: Always close parsed input file.

Browse source 
Fixes a regression from 9d537999e3, which removed closing the file.
This causes Windows widl build to be to remove the temporary file on exit.
This commit is contained in:
Jacek Caban 2024-03-20 13:50:01 +01:00 committed by Alexandre Julliard
parent 6ce8a31b0b
commit 3b12583db0
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/widl/parser.h
View file

@ -42,5 +42,6 @@ int is_warning_enabled(int warning);
extern char *find_input_file( const char *name, const char *parent ); extern char *find_input_file( const char *name, const char *parent );
extern FILE *open_input_file( const char *path ); extern FILE *open_input_file( const char *path );
extern void close_all_inputs(void);
#endif #endif

12
tools/widl/parser.l
View file

@ -481,10 +481,11 @@ static void print_imports(void)
fprintf( stderr, "%s:%d:\n", state->input_name, state->where.first_line ); fprintf( stderr, "%s:%d:\n", state->input_name, state->where.first_line );
} }
void pop_import( struct location *where ) struct location pop_import(void)
{ {
struct list *entry = list_head( &import_stack ); struct list *entry = list_head( &import_stack );
struct import_state *state; struct import_state *state;
struct location where;
assert( entry ); assert( entry );
state = LIST_ENTRY( entry, struct import_state, entry ); state = LIST_ENTRY( entry, struct import_state, entry );
@ -496,8 +497,9 @@ void pop_import( struct location *where )
yy_switch_to_buffer( state->buffer ); yy_switch_to_buffer( state->buffer );
input_name = state->input_name; input_name = state->input_name;
*where = state->where; where = state->where;
free( state ); free( state );
return where;
} }
void push_import( const char *import_name, struct location *where ) void push_import( const char *import_name, struct location *where )
@ -547,6 +549,12 @@ static void switch_to_acf(void)
yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) ); yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) );
} }
void close_all_inputs(void)
{
while (!list_empty( &import_stack )) pop_import();
if (yyin) fclose( yyin );
}
static void reset_location( struct location *where, const char *input_name ) static void reset_location( struct location *where, const char *input_name )
{ {
where->first_line = 1; where->first_line = 1;

4
tools/widl/parser.y
View file

@ -118,7 +118,7 @@ static typelib_t *current_typelib;
int parser_lex( PARSER_STYPE *yylval, PARSER_LTYPE *yylloc ); int parser_lex( PARSER_STYPE *yylval, PARSER_LTYPE *yylloc );
void push_import( const char *fname, PARSER_LTYPE *yylloc ); void push_import( const char *fname, PARSER_LTYPE *yylloc );
void pop_import( PARSER_LTYPE *yylloc ); PARSER_LTYPE pop_import(void);
# define YYLLOC_DEFAULT( cur, rhs, n ) \ # define YYLLOC_DEFAULT( cur, rhs, n ) \
do { if (n) init_location( &(cur), &YYRHSLOC( rhs, 1 ), &YYRHSLOC( rhs, n ) ); \ do { if (n) init_location( &(cur), &YYRHSLOC( rhs, 1 ), &YYRHSLOC( rhs, n ) ); \
@ -515,7 +515,7 @@ cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; }
import_start: tIMPORT aSTRING ';' { $$ = $2; push_import( $2, &yylloc ); } import_start: tIMPORT aSTRING ';' { $$ = $2; push_import( $2, &yylloc ); }
; ;
import: import_start imp_statements aEOF { pop_import( &yylloc ); } import: import_start imp_statements aEOF { yyloc = pop_import(); }
; ;
importlib: tIMPORTLIB '(' aSTRING ')' importlib: tIMPORTLIB '(' aSTRING ')'

6
tools/widl/widl.c
View file

@ -843,10 +843,8 @@ int main(int argc,char *argv[])
init_types(); init_types();
ret = parser_parse(); ret = parser_parse();
close_all_inputs();
if(ret) { if (ret) exit(1);
exit(1);
}
/* Everything has been done successfully, don't delete any files. */ /* Everything has been done successfully, don't delete any files. */
set_everything(FALSE); set_everything(FALSE);