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

fixes for re-declaring type identifiers in inconsistent ways - addresses GH-2686

Browse source
This commit is contained in:
Vern Paxson 2025-09-27 22:23:57 -07:00
parent 0700427bac
commit 941ecee692
4 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Var.cc
View file

@ -348,6 +348,35 @@ extern ExprPtr add_and_assign_local(IDPtr id, ExprPtr init, ValPtr val) {
}
void add_type(ID* id, TypePtr t, std::unique_ptr<std::vector<AttrPtr>> attr) {
if ( const auto& old_t = id->GetType() ) {
// The identifier already has a type associated with it. This can
// be okay if (1) it's already been marked as a Type identifier,
// (2) the previous type is a stub, or an equivalent enum.
if ( ! id->IsType() ) {
reporter->Error("Identifier %s has already been declared and is not a type", id->Name());
return;
}
if ( old_t->Tag() == t->Tag() && ((old_t->Tag() == TYPE_RECORD && old_t->AsRecordType()->NumFields() == 0) ||
(t->Tag() == TYPE_ENUM && same_type(t, old_t))) )
// It has a consistent tag and is either redeclaring a stub
// record (used in init-bare.zeek) or an equivalent enum
// (which can appear due to specifiers in BiFs, for example).
;
else {
std::string loc;
auto li = id->GetLocationInfo();
auto fn = li->FileName();
int ln = li->FirstLine();
if ( fn && fn[0] != '\0' )
loc = " at " + std::string(fn) + ":" + std::to_string(ln);
reporter->Error("Type %s has already been declared%s", id->Name(), loc.c_str());
return;
}
}
std::string new_type_name = id->Name();
std::string old_type_name = t->GetName();

2
testing/btest/Baseline/language.redeclaration-redefinition-errors-12/out Normal file
View file

@ -0,0 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/redeclaration-redefinition-errors.zeek, line 2: Identifier f has already been declared and is not a type

2
testing/btest/Baseline/language.redeclaration-redefinition-errors-13/out Normal file
View file

@ -0,0 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/redeclaration-redefinition-errors.zeek, line 2: Type f has already been declared at <...>/redeclaration-redefinition-errors.zeek:1

8
testing/btest/language/redeclaration-redefinition-errors.zeek
View file

@ -59,3 +59,11 @@ global f: function();
global f = function() { };
global f: hook();
global f: event();
# @TEST-START-NEXT
global f = function() { };
type f: bool;
# @TEST-START-NEXT
type f: record {};
type f: bool;