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

Remove unused reserved keyword "this"

Browse source 
Removed unused reserved keyword "this" (a script using it would cause Bro to
segfault).
This commit is contained in:
Daniel Thayer 2012-09-26 13:09:54 -05:00
parent bf62a6e673
commit 5593f339bd
2 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/parse.y
View file

@ -14,7 +14,7 @@
%token TOK_NEXT TOK_OF TOK_PATTERN TOK_PATTERN_TEXT %token TOK_NEXT TOK_OF TOK_PATTERN TOK_PATTERN_TEXT
%token TOK_PORT TOK_PRINT TOK_RECORD TOK_REDEF %token TOK_PORT TOK_PRINT TOK_RECORD TOK_REDEF
%token TOK_REMOVE_FROM TOK_RETURN TOK_SCHEDULE TOK_SET %token TOK_REMOVE_FROM TOK_RETURN TOK_SCHEDULE TOK_SET
%token TOK_STRING TOK_SUBNET TOK_SWITCH TOK_TABLE TOK_THIS %token TOK_STRING TOK_SUBNET TOK_SWITCH TOK_TABLE
%token TOK_TIME TOK_TIMEOUT TOK_TIMER TOK_TYPE TOK_UNION TOK_VECTOR TOK_WHEN %token TOK_TIME TOK_TIMEOUT TOK_TIMER TOK_TYPE TOK_UNION TOK_VECTOR TOK_WHEN
%token TOK_ATTR_ADD_FUNC TOK_ATTR_ATTR TOK_ATTR_ENCRYPT TOK_ATTR_DEFAULT %token TOK_ATTR_ADD_FUNC TOK_ATTR_ATTR TOK_ATTR_ENCRYPT TOK_ATTR_DEFAULT
@ -118,7 +118,6 @@ extern const char* g_curr_debug_error;
#define YYLTYPE yyltype #define YYLTYPE yyltype
Expr* bro_this = 0;
int in_init = 0; int in_init = 0;
int in_record = 0; int in_record = 0;
bool resolving_global_ID = false; bool resolving_global_ID = false;
@ -584,12 +583,6 @@ expr:
$$ = new ConstExpr(new PatternVal($1)); $$ = new ConstExpr(new PatternVal($1));
} }
| TOK_THIS
{
set_location(@1);
$$ = bro_this->Ref();
}
| '|' expr '|' | '|' expr '|'
{ {
set_location(@1, @3); set_location(@1, @3);

1
src/scan.l
View file

@ -306,7 +306,6 @@ string return TOK_STRING;
subnet return TOK_SUBNET; subnet return TOK_SUBNET;
switch return TOK_SWITCH; switch return TOK_SWITCH;
table return TOK_TABLE; table return TOK_TABLE;
this return TOK_THIS;
time return TOK_TIME; time return TOK_TIME;
timeout return TOK_TIMEOUT; timeout return TOK_TIMEOUT;
timer return TOK_TIMER; timer return TOK_TIMER;