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

widl: Introduce new (open|close)_input_file helpers.

Browse source
This commit is contained in:
Rémi Bernon 2023-03-15 09:48:20 +01:00 committed by Alexandre Julliard
parent a6ab03dcd5
commit 39da052012
3 changed files with 40 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/widl/parser.h
View file

@ -37,6 +37,7 @@ int is_type(const char *name);
int do_warning(const char *toggle, warning_list_t *wnum);
int is_warning_enabled(int warning);
extern char *temp_name;
extern char *find_input_file( const char *name, const char *parent );
extern FILE *open_input_file( const char *path );
#endif

51
tools/widl/parser.l
View file

@ -524,6 +524,7 @@ void pop_import(void)
if (yyin) fclose( yyin );
yy_delete_buffer( YY_CURRENT_BUFFER );
yy_switch_to_buffer( state->buffer );
free( input_name );
input_name = state->input_name;
line_number = state->line_number;
free( state );
@ -532,10 +533,8 @@ void pop_import(void)
void push_import( char *import_name )
{
struct import_state *state;
FILE *f;
char *path, *name;
struct import *import;
int ret;
FILE *file;
state = xmalloc( sizeof(struct import_state ));
list_add_head( &import_stack, &state->entry );
@ -556,55 +555,27 @@ void push_import( char *import_name )
import->name = xstrdup( import_name );
list_add_tail( &imports, &import->entry );
/* don't search for a file name with a path in the include directories,
* for compatibility with MIDL */
if (strchr( import_name, '/' ) || strchr( import_name, '\\' ))
path = xstrdup( import_name );
else if (!(path = wpp_find_include( import_name, input_name )))
error_loc( "Unable to open include file %s\n", import_name );
input_name = path;
input_name = find_input_file( import_name, input_name );
file = open_input_file( input_name );
line_number = 1;
name = make_temp_file( "widl-pp", NULL );
if (!(f = fopen(name, "wt")))
error("Could not open fd %s for writing\n", name);
ret = wpp_parse( path, f );
fclose( f );
if (ret) exit(1);
if((f = fopen(name, "r")) == NULL)
error_loc("Unable to open %s\n", name);
yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE));
yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) );
}
static void switch_to_acf(void)
{
char *name;
int ret;
FILE *f;
FILE *file;
if (yyin) fclose( yyin );
yy_delete_buffer( YY_CURRENT_BUFFER );
free( input_name );
input_name = acf_name;
acf_name = NULL;
input_name = xstrdup( acf_name );
file = open_input_file( input_name );
line_number = 1;
acf_name = NULL;
name = make_temp_file( "widl-acf", NULL );
if (!(f = fopen(name, "wt")))
error("Could not open fd %s for writing\n", name);
ret = wpp_parse(input_name, f);
fclose(f);
if (ret) exit(1);
if((f = fopen(name, "r")) == NULL)
error_loc("Unable to open %s\n", name);
yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE));
yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) );
}
static void warning_disable(int warning)

27
tools/widl/widl.c
View file

@ -893,3 +893,30 @@ static void rm_tempfile(void)
unlink(typelib_name);
remove_temp_files();
}
char *find_input_file( const char *name, const char *parent )
{
char *path;
/* don't search for a file name with a path in the include directories, for compatibility with MIDL */
if (strchr( name, '/' ) || strchr( name, '\\' )) path = xstrdup( name );
else if (!(path = wpp_find_include( name, parent ))) error_loc( "Unable to open include file %s\n", name );
return path;
}
FILE *open_input_file( const char *path )
{
FILE *file;
char *name;
int ret;
name = make_temp_file( "widl", NULL );
if (!(file = fopen( name, "wt" ))) error_loc( "Could not open %s for writing\n", name );
ret = wpp_parse( path, file );
fclose( file );
if (ret) exit( 1 );
if (!(file = fopen( name, "r" ))) error_loc( "Unable to open %s\n", name );
return file;
}