From 36a6472f9563e9d941768ddf92eefbf045d2056b Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@slot.vk.crocodile.org>
Date: Sat, 4 Jun 2011 20:36:07 -0700
Subject: [PATCH] fixing build on windows mingw: avoid token name "IN"

---
 src/parsers/PFCfgParser.cpp           | 20 ++++++++++----------
 src/parsers/PFCfgParserTokenTypes.hpp |  4 ++--
 src/parsers/PFCfgParserTokenTypes.txt |  4 ++--
 src/parsers/pf.g                      |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/parsers/PFCfgParser.cpp b/src/parsers/PFCfgParser.cpp
index 195dceddc..790e05201 100644
--- a/src/parsers/PFCfgParser.cpp
+++ b/src/parsers/PFCfgParser.cpp
@@ -1301,8 +1301,8 @@ void PFCfgParser::block_rule() {
 		case EXLAMATION:
 		case NO:
 		case OPENING_PAREN:
-		case IN:
-		case OUT:
+		case IN_WORD:
+		case OUT_WORD:
 		case LOG:
 		case ALL:
 		case TO:
@@ -2103,8 +2103,8 @@ void PFCfgParser::rule_extended() {
 	try {      // for error handling
 		{
 		switch ( LA(1)) {
-		case IN:
-		case OUT:
+		case IN_WORD:
+		case OUT_WORD:
 		{
 			direction();
 			break;
@@ -3429,8 +3429,8 @@ void PFCfgParser::block_return() {
 			case EXLAMATION:
 			case NO:
 			case OPENING_PAREN:
-			case IN:
-			case OUT:
+			case IN_WORD:
+			case OUT_WORD:
 			case LOG:
 			case ALL:
 			case TO:
@@ -3806,14 +3806,14 @@ void PFCfgParser::direction() {
 	try {      // for error handling
 		{
 		switch ( LA(1)) {
-		case IN:
+		case IN_WORD:
 		{
-			match(IN);
+			match(IN_WORD);
 			break;
 		}
-		case OUT:
+		case OUT_WORD:
 		{
-			match(OUT);
+			match(OUT_WORD);
 			break;
 		}
 		default:
diff --git a/src/parsers/PFCfgParserTokenTypes.hpp b/src/parsers/PFCfgParserTokenTypes.hpp
index dac38128d..4cf0ef97c 100644
--- a/src/parsers/PFCfgParserTokenTypes.hpp
+++ b/src/parsers/PFCfgParserTokenTypes.hpp
@@ -115,8 +115,8 @@ struct CUSTOM_API PFCfgParserTokenTypes {
 		TTL = 104,
 		RETURN_ICMP = 105,
 		RETURN_ICMP6 = 106,
-		IN = 107,
-		OUT = 108,
+		IN_WORD = 107,
+		OUT_WORD = 108,
 		LOG = 109,
 		ALL = 110,
 		USER = 111,
diff --git a/src/parsers/PFCfgParserTokenTypes.txt b/src/parsers/PFCfgParserTokenTypes.txt
index 0414a6b24..be3d5cff2 100644
--- a/src/parsers/PFCfgParserTokenTypes.txt
+++ b/src/parsers/PFCfgParserTokenTypes.txt
@@ -103,8 +103,8 @@ RETURN_RST="return-rst"=103
 TTL=104
 RETURN_ICMP="return-icmp"=105
 RETURN_ICMP6=106
-IN="in"=107
-OUT="out"=108
+IN_WORD="in"=107
+OUT_WORD="out"=108
 LOG="log"=109
 ALL="all"=110
 USER="user"=111
diff --git a/src/parsers/pf.g b/src/parsers/pf.g
index 7b956dc19..eba6d7fe4 100644
--- a/src/parsers/pf.g
+++ b/src/parsers/pf.g
@@ -985,7 +985,7 @@ rule_extended :
         ( filteropts )?
     ;
 
-direction : ( IN | OUT )
+direction : ( IN_WORD | OUT_WORD )
         {
             importer->direction = LT(0)->getText();
         }
@@ -1783,8 +1783,8 @@ tokens
 
     QUICK = "quick";
 
-    IN = "in";
-    OUT = "out";
+    IN_WORD = "in";
+    OUT_WORD = "out";
 
     ON = "on";
     PROTO = "proto";