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

fix bug that sometimes associated the wrong location with global statements

Browse source
This commit is contained in:
Vern Paxson 2022-05-12 13:40:57 -07:00
parent f25aded984
commit 5a32e58e04
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/parse.y
View file

@ -317,12 +317,22 @@ static StmtPtr build_local(ID* id, Type* t, InitClass ic, Expr* e,
%%
zeek:
decl_list stmt_list
decl_list
{
// Without the following, in some scenarios the
// location associated with global statements gets
// associated with the last @load'd file rather than
// the script that includes the global statements.
auto loc = zeek::detail::GetCurrentLocation();
if ( loc.filename )
set_location(loc);
}
stmt_list
{
if ( stmts )
stmts->AsStmtList()->Stmts().push_back($2);
stmts->AsStmtList()->Stmts().push_back($3);
else
stmts = $2;
stmts = $3;
// Any objects creates from here on out should not
// have file positions associated with them.