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

Merge remote-tracking branch 'origin/topic/etyp/remove-list'

Browse source 
* origin/topic/etyp/remove-list:
  Remove `list` from Zeek grammar
This commit is contained in:
Evan Typanski 2025-06-25 10:35:53 -04:00
commit d3593e0489
4 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,3 +1,10 @@
8.0.0-dev.530 | 2025-06-25 10:35:53 -0400
* Remove `list` from Zeek grammar (Evan Typanski, Corelight)
Using it would make Zeek segfault (at least in locals). It has been an
error for 15 years.
8.0.0-dev.528 | 2025-06-25 14:17:35 +0200 8.0.0-dev.528 | 2025-06-25 14:17:35 +0200
* btest/plugins: Add test for custom ConnKey factory (Arne Welzel, Corelight) * btest/plugins: Add test for custom ConnKey factory (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.528 8.0.0-dev.530

18
src/parse.y
View file

@ -13,7 +13,7 @@
%token TOK_CONSTANT TOK_COPY TOK_COUNT TOK_DEFAULT TOK_DELETE %token TOK_CONSTANT TOK_COPY TOK_COUNT TOK_DEFAULT TOK_DELETE
%token TOK_DOUBLE TOK_ELSE TOK_ENUM TOK_EVENT TOK_EXPORT TOK_FALLTHROUGH %token TOK_DOUBLE TOK_ELSE TOK_ENUM TOK_EVENT TOK_EXPORT TOK_FALLTHROUGH
%token TOK_FILE TOK_FOR TOK_FUNCTION TOK_GLOBAL TOK_HOOK TOK_ID TOK_IF TOK_INT %token TOK_FILE TOK_FOR TOK_FUNCTION TOK_GLOBAL TOK_HOOK TOK_ID TOK_IF TOK_INT
%token TOK_INTERVAL TOK_LIST TOK_MODULE %token TOK_INTERVAL TOK_MODULE
%token TOK_LOCAL TOK_WHEN_LOCAL %token TOK_LOCAL TOK_WHEN_LOCAL
%token TOK_NEXT TOK_OF TOK_OPAQUE TOK_PATTERN TOK_PATTERN_END TOK_PATTERN_TEXT %token TOK_NEXT TOK_OF TOK_OPAQUE TOK_PATTERN TOK_PATTERN_END TOK_PATTERN_TEXT
%token TOK_PORT TOK_PRINT TOK_RECORD TOK_REDEF %token TOK_PORT TOK_PRINT TOK_RECORD TOK_REDEF
@ -1210,22 +1210,6 @@ simple_type:
$$ = $4; $$ = $4;
} }
| TOK_LIST
{
set_location(@1);
// $$ = new TypeList();
reporter->Error("list type not implemented");
$$ = 0;
}
| TOK_LIST TOK_OF type
{
set_location(@1);
// $$ = new TypeList($3);
reporter->Error("list type not implemented");
$$ = 0;
}
| TOK_VECTOR TOK_OF type | TOK_VECTOR TOK_OF type
{ {
set_location(@1, @3); set_location(@1, @3);

1
src/scan.l
View file

@ -347,7 +347,6 @@ in return TOK_IN;
int return TOK_INT; int return TOK_INT;
interval return TOK_INTERVAL; interval return TOK_INTERVAL;
is return TOK_IS; is return TOK_IS;
list return TOK_LIST;
local return in_when_cond ? TOK_WHEN_LOCAL : TOK_LOCAL; local return in_when_cond ? TOK_WHEN_LOCAL : TOK_LOCAL;
module return TOK_MODULE; module return TOK_MODULE;
next return TOK_NEXT; next return TOK_NEXT;