From 5593f339bdd4dfd9e35c24ededd1b4457350c7e5 Mon Sep 17 00:00:00 2001
From: Daniel Thayer <dnthayer@ncsa.illinois.edu>
Date: Wed, 26 Sep 2012 13:09:54 -0500
Subject: [PATCH] Remove unused reserved keyword "this"

Removed unused reserved keyword "this" (a script using it would cause Bro to
segfault).
---
 src/parse.y | 9 +--------
 src/scan.l  | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/parse.y b/src/parse.y
index 75e09dc60f..27af150254 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 %token TOK_NEXT TOK_OF TOK_PATTERN TOK_PATTERN_TEXT
 %token TOK_PORT TOK_PRINT TOK_RECORD TOK_REDEF
 %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_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
 
-Expr* bro_this = 0;
 int in_init = 0;
 int in_record = 0;
 bool resolving_global_ID = false;
@@ -584,12 +583,6 @@ expr:
 			$$ = new ConstExpr(new PatternVal($1));
 			}
 
-	|	TOK_THIS
-			{
-			set_location(@1);
-			$$ = bro_this->Ref();
-			}
-
 	|       '|' expr '|'
 			{
 			set_location(@1, @3);
diff --git a/src/scan.l b/src/scan.l
index 3f7337ac47..d213b60012 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -306,7 +306,6 @@ string	return TOK_STRING;
 subnet	return TOK_SUBNET;
 switch	return TOK_SWITCH;
 table	return TOK_TABLE;
-this	return TOK_THIS;
 time	return TOK_TIME;
 timeout	return TOK_TIMEOUT;
 timer	return TOK_TIMER;