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 1

Merge remote-tracking branch 'origin/topic/vern/id-redecl'
Some checks failed
pre-commit / pre-commit (push) Has been cancelled
Details

Browse source 
* origin/topic/vern/id-redecl:
  fixes for re-declaring type identifiers in inconsistent ways - addresses GH-2686
This commit is contained in:
Tim Wojtulewicz 2025-09-30 20:46:27 +00:00
commit 8b4707a284
6 changed files with 46 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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;