Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

track the use of conditionals in functions and files

Browse source
This commit is contained in:
Vern Paxson 2021-11-24 15:19:01 -08:00
parent f865897cac
commit e73351a6e1
5 changed files with 103 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/parse.y
View file

@ -105,6 +105,11 @@ extern const char* last_filename; // Absolute path of last file parsed.
extern const char* last_tok_filename;
extern const char* last_last_tok_filename;
extern int conditional_epoch; // let's us track embedded conditionals
// Whether the file we're currently parsing includes @if conditionals.
extern bool current_file_has_conditionals;
YYLTYPE GetCurrentLocation();
extern int yyerror(const char[]);
extern int brolex();
@ -138,6 +143,7 @@ bool defining_global_ID = false;
std::vector<int> saved_in_init;
static Location func_hdr_location;
static int func_hdr_cond_epoch = 0;
EnumType* cur_enum_type = nullptr;
static ID* cur_decl_type_id = nullptr;
@ -1214,16 +1220,19 @@ decl:
zeekygen_mgr->Identifier(std::move(id));
}
| func_hdr { func_hdr_location = @1; } func_body
| func_hdr { func_hdr_location = @1; } conditional_list func_body
| func_hdr
{
func_hdr_location = @1;
func_hdr_cond_epoch = conditional_epoch;
}
conditional_list func_body
| conditional
;
conditional_list:
conditional
| conditional conditional_list
| conditional_list conditional
;
conditional:
TOK_ATIF '(' expr ')'
@ -1296,7 +1305,13 @@ func_body:
'}'
{
set_location(func_hdr_location, @5);
end_func({AdoptRef{}, $3});
bool free_of_conditionals = true;
if ( current_file_has_conditionals ||
conditional_epoch > func_hdr_cond_epoch )
free_of_conditionals = false;
end_func({AdoptRef{}, $3}, free_of_conditionals);
}
;