[rtems-libbsd commit] Update yacc and lex generated files

Sebastian Huber sebh at rtems.org
Tue Aug 28 10:53:37 UTC 2018


Module:    rtems-libbsd
Branch:    master
Commit:    fa3e012fc6b9c0b83e19881d6bfc987db1d4705a
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=fa3e012fc6b9c0b83e19881d6bfc987db1d4705a

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Aug 28 12:00:46 2018 +0200

Update yacc and lex generated files

Use the FreeBSD 11.1 yacc and lex tools to generate the files.

Update #3472.

---

 Makefile.todo                   |  64 +++-
 freebsd/lib/libc/net/nslexer.c  |  46 +--
 freebsd/lib/libc/net/nsparser.c |  97 +++--
 freebsd/sbin/pfctl/parse.c      | 770 ++++++++++++++++++++--------------------
 freebsd/sbin/pfctl/parse.h      | 467 +++++++-----------------
 5 files changed, 632 insertions(+), 812 deletions(-)

diff --git a/Makefile.todo b/Makefile.todo
index 8890fd2..0275689 100644
--- a/Makefile.todo
+++ b/Makefile.todo
@@ -41,13 +41,28 @@ GENERATED += $(LOCAL_INC)/gpiobus_if.h
 GENERATED += $(LOCAL_SRC)/gpiobus_if.c
 GENERATED += rtemsbsd/include/machine/rtems-bsd-regdomain.h
 GENERATED += rtemsbsd/rtems/rtems-bsd-regdomain.c
-GENERATED += freebsd/contrib/libpcap/grammar.h
-GENERATED += freebsd/contrib/libpcap/grammar.c
 GENERATED += freebsd/contrib/libpcap/pcap_version.h
-GENERATED += freebsd/contrib/libpcap/scanner.h
-GENERATED += freebsd/contrib/libpcap/scanner.c
 
-all: $(GENERATED)
+YACC_GENERATED =
+LEX_GENERATED =
+
+YACC_GENERATED += freebsd/lib/libc/net/nsparser.h
+YACC_GENERATED += freebsd/lib/libc/net/nsparser.c
+LEX_GENERATED += freebsd/lib/libc/net/nslexer.c
+
+YACC_GENERATED += freebsd/sbin/pfctl/parse.h
+YACC_GENERATED += freebsd/sbin/pfctl/parse.c
+
+YACC_GENERATED += freebsd/contrib/libpcap/grammar.h
+YACC_GENERATED += freebsd/contrib/libpcap/grammar.c
+LEX_GENERATED += freebsd/contrib/libpcap/scanner.h
+LEX_GENERATED += freebsd/contrib/libpcap/scanner.c
+
+yacc: $(YACC_GENERATED)
+
+lex: $(LEX_GENERATED)
+
+all: yacc lex $(GENERATED)
 
 $(LOCAL_INC)/usbdevs.h: $(FREEBSD_SRC)/sys/dev/usb/usbdevs
 	awk -f $(TOOLS)/usbdevs2h.awk $< -h
@@ -229,22 +244,37 @@ rtemsbsd/include/machine/rtems-bsd-regdomain.h: $(FREEBSD_SRC)/etc/regdomain.xml
 rtemsbsd/rtems/rtems-bsd-regdomain.c: $(FREEBSD_SRC)/etc/regdomain.xml
 	rtems-bin2c -C $< $@
 
-freebsd/contrib/libpcap/grammar.h: freebsd/contrib/libpcap/grammar.c
-
-freebsd/contrib/libpcap/grammar.c: freebsd-org/contrib/libpcap/grammar.y
-	cd freebsd-org/contrib/libpcap && yacc -p pcap_ -o grammar.c -d grammar.y
-	mv freebsd-org/contrib/libpcap/grammar.h freebsd/contrib/libpcap/grammar.h
-	mv freebsd-org/contrib/libpcap/grammar.c $@
-
 freebsd/contrib/libpcap/pcap_version.h: freebsd-org/contrib/libpcap/VERSION
 	freebsd-org/contrib/libpcap/gen_version_header.sh $< freebsd-org/contrib/libpcap/pcap_version.h.in $@
 
+freebsd/lib/libc/net/nsparser.h: freebsd/lib/libc/net/nsparser.c
+
+freebsd/lib/libc/net/nsparser.c: freebsd/lib/libc/net/nsparser.y
+	cd freebsd/lib/libc/net && yacc -p _nsyy -o nsparser.c -d nsparser.y
+
+freebsd/lib/libc/net/nslexer.c: freebsd/lib/libc/net/nslexer.l
+	cd freebsd/lib/libc/net && lex -P _nsyy -DYY_BUF_SIZE=1024 -o nslexer.c nslexer.l
+
+freebsd/sbin/pfctl/parse.h: freebsd/sbin/pfctl/parse.c
+
+freebsd/sbin/pfctl/parse.c: freebsd/sbin/pfctl/parse.y
+	cd freebsd/sbin/pfctl && yacc -p pfctly -o parse.c -d parse.y
+
+freebsd/contrib/libpcap/grammar.h: freebsd/contrib/libpcap/grammar.c
+
+freebsd/contrib/libpcap/grammar.c: freebsd/contrib/libpcap/grammar.y
+	cd freebsd/contrib/libpcap && yacc -p pcap_ -o grammar.c -d grammar.y
+
 freebsd/contrib/libpcap/scanner.h: freebsd/contrib/libpcap/scanner.c
 
-freebsd/contrib/libpcap/scanner.c: freebsd-org/contrib/libpcap/scanner.l
-	cd freebsd-org/contrib/libpcap && lex -P pcap_ --header-file=scanner.h --nounput -o scanner.c scanner.l
-	mv freebsd-org/contrib/libpcap/scanner.h freebsd/contrib/libpcap/scanner.h
-	mv freebsd-org/contrib/libpcap/scanner.c $@
+freebsd/contrib/libpcap/scanner.c: freebsd/contrib/libpcap/scanner.l
+	cd freebsd/contrib/libpcap && lex -P pcap_ --header-file=scanner.h --nounput -o scanner.c scanner.l
+
+clean-yacc:
+	rm $(YACC_GENERATED)
+
+clean-lex:
+	rm $(LEX_GENERATED)
 
-clean:
+clean: clean-yacc clean-lex
 	rm $(GENERATED)
diff --git a/freebsd/lib/libc/net/nslexer.c b/freebsd/lib/libc/net/nslexer.c
index 5808977..2a86898 100644
--- a/freebsd/lib/libc/net/nslexer.c
+++ b/freebsd/lib/libc/net/nslexer.c
@@ -1,6 +1,8 @@
+#line 2 "nslexer.c"
 
-#line 3 "<stdout>"
+#line 4 "nslexer.c"
 
+#define YY_BUF_SIZE 1024
 #define  YY_INT_ALIGNED short int
 
 /* A lexical scanner generated by flex */
@@ -171,7 +173,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 1024
+#define YY_BUF_SIZE 16384
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -531,8 +533,8 @@ int _nsyy_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *_nsyytext;
-#line 1 "../../freebsd/lib/libc/net/nslexer.l"
-#line 2 "../../freebsd/lib/libc/net/nslexer.l"
+#line 1 "nslexer.l"
+#line 2 "nslexer.l"
 /*	$NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $	*/
 
 /*-
@@ -581,7 +583,7 @@ static char *rcsid =
 #include "nsparser.h"
 
 #define YY_NO_INPUT 1
-#line 585 "<stdout>"
+#line 587 "nslexer.c"
 
 #define INITIAL 0
 
@@ -761,10 +763,10 @@ YY_DECL
 	char *yy_cp, *yy_bp;
 	int yy_act;
     
-#line 59 "../../freebsd/lib/libc/net/nslexer.l"
+#line 59 "nslexer.l"
 
 
-#line 768 "<stdout>"
+#line 770 "nslexer.c"
 
 	if ( !(yy_init) )
 		{
@@ -859,59 +861,59 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 61 "../../freebsd/lib/libc/net/nslexer.l"
+#line 61 "nslexer.l"
 ;			/* skip whitespace */
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 63 "../../freebsd/lib/libc/net/nslexer.l"
+#line 63 "nslexer.l"
 ;			/* skip comments */
 	YY_BREAK
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 65 "../../freebsd/lib/libc/net/nslexer.l"
+#line 65 "nslexer.l"
 ;			/* allow continuation */
 	YY_BREAK
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 67 "../../freebsd/lib/libc/net/nslexer.l"
+#line 67 "nslexer.l"
 return NL;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 69 "../../freebsd/lib/libc/net/nslexer.l"
+#line 69 "nslexer.l"
 return SUCCESS;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 70 "../../freebsd/lib/libc/net/nslexer.l"
+#line 70 "nslexer.l"
 return UNAVAIL;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 71 "../../freebsd/lib/libc/net/nslexer.l"
+#line 71 "nslexer.l"
 return NOTFOUND;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 72 "../../freebsd/lib/libc/net/nslexer.l"
+#line 72 "nslexer.l"
 return TRYAGAIN;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 74 "../../freebsd/lib/libc/net/nslexer.l"
+#line 74 "nslexer.l"
 return RETURN;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 75 "../../freebsd/lib/libc/net/nslexer.l"
+#line 75 "nslexer.l"
 return CONTINUE;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 77 "../../freebsd/lib/libc/net/nslexer.l"
+#line 77 "nslexer.l"
 {
 			char *p;
 			int i;
@@ -931,15 +933,15 @@ YY_RULE_SETUP
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 94 "../../freebsd/lib/libc/net/nslexer.l"
+#line 94 "nslexer.l"
 return _nsyytext[0];
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 96 "../../freebsd/lib/libc/net/nslexer.l"
+#line 96 "nslexer.l"
 ECHO;
 	YY_BREAK
-#line 943 "<stdout>"
+#line 945 "nslexer.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1904,7 +1906,7 @@ void _nsyyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 96 "../../freebsd/lib/libc/net/nslexer.l"
+#line 96 "nslexer.l"
 
 
 
diff --git a/freebsd/lib/libc/net/nsparser.c b/freebsd/lib/libc/net/nsparser.c
index 74ed8f0..aefcde2 100644
--- a/freebsd/lib/libc/net/nsparser.c
+++ b/freebsd/lib/libc/net/nsparser.c
@@ -5,7 +5,7 @@
 #define YYBYACC 1
 #define YYMAJOR 1
 #define YYMINOR 9
-#define YYPATCH 20160324
+#define YYPATCH 20170201
 
 #define YYEMPTY        (-1)
 #define yyclearin      (yychar = YYEMPTY)
@@ -97,7 +97,7 @@
 
 #define YYPURE 0
 
-#line 2 "../../freebsd/lib/libc/net/nsparser.y"
+#line 2 "nsparser.y"
 /*	$NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $	*/
 
 /*-
@@ -145,19 +145,19 @@ static	void	_nsaddsrctomap(const char *);
 
 static	ns_dbt		curdbt;
 static	ns_src		cursrc;
-#line 51 "../../freebsd/lib/libc/net/nsparser.y"
 #ifdef YYSTYPE
 #undef  YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
 #endif
 #ifndef YYSTYPE_IS_DECLARED
 #define YYSTYPE_IS_DECLARED 1
+#line 51 "nsparser.y"
 typedef union {
 	char *str;
 	int   mapval;
 } YYSTYPE;
 #endif /* !YYSTYPE_IS_DECLARED */
-#line 161 "_nsyy.tab.c"
+#line 161 "nsparser.c"
 
 /* compatibility with bison */
 #ifdef YYPARSE_PARAM
@@ -356,7 +356,7 @@ typedef struct {
 } YYSTACKDATA;
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
-#line 146 "../../freebsd/lib/libc/net/nsparser.y"
+#line 146 "nsparser.y"
 
 static void
 _nsaddsrctomap(const char *elem)
@@ -389,10 +389,10 @@ _nsaddsrctomap(const char *elem)
 	cursrc.name = elem;
 	_nsdbtaddsrc(&curdbt, &cursrc);
 }
-#line 393 "_nsyy.tab.c"
+#line 393 "nsparser.c"
 
 #if YYDEBUG
-#include <stdio.h>		/* needed for printf */
+#include <stdio.h>	/* needed for printf */
 #endif
 
 #include <stdlib.h>	/* needed for malloc, etc */
@@ -464,6 +464,8 @@ YYPARSE_DECL()
     }
 #endif
 
+    yym = 0;
+    yyn = 0;
     yynerrs = 0;
     yyerrflag = 0;
     yychar = YYEMPTY;
@@ -483,28 +485,26 @@ yyloop:
     if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
     if (yychar < 0)
     {
-        if ((yychar = YYLEX) < 0) yychar = YYEOF;
+        yychar = YYLEX;
+        if (yychar < 0) yychar = YYEOF;
 #if YYDEBUG
         if (yydebug)
         {
-            yys = yyname[YYTRANSLATE(yychar)];
+            if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
             printf("%sdebug: state %d, reading %d (%s)\n",
                     YYPREFIX, yystate, yychar, yys);
         }
 #endif
     }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+    if (((yyn = yysindex[yystate]) != 0) && (yyn += yychar) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)
     {
 #if YYDEBUG
         if (yydebug)
             printf("%sdebug: state %d, shifting to state %d\n",
                     YYPREFIX, yystate, yytable[yyn]);
 #endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
-        {
-            goto yyoverflow;
-        }
+        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
         yystate = yytable[yyn];
         *++yystack.s_mark = yytable[yyn];
         *++yystack.l_mark = yylval;
@@ -512,18 +512,17 @@ yyloop:
         if (yyerrflag > 0)  --yyerrflag;
         goto yyloop;
     }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+    if (((yyn = yyrindex[yystate]) != 0) && (yyn += yychar) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)
     {
         yyn = yytable[yyn];
         goto yyreduce;
     }
-    if (yyerrflag) goto yyinrecovery;
+    if (yyerrflag != 0) goto yyinrecovery;
 
     YYERROR_CALL("syntax error");
 
-    goto yyerrlab;
-
+    goto yyerrlab; /* redundant goto avoids 'unused label' warning */
 yyerrlab:
     ++yynerrs;
 
@@ -533,18 +532,15 @@ yyinrecovery:
         yyerrflag = 3;
         for (;;)
         {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
+            if (((yyn = yysindex[*yystack.s_mark]) != 0) && (yyn += YYERRCODE) >= 0 &&
+                    yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) YYERRCODE)
             {
 #if YYDEBUG
                 if (yydebug)
                     printf("%sdebug: state %d, error recovery shifting\
  to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
 #endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
-                {
-                    goto yyoverflow;
-                }
+                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
                 yystate = yytable[yyn];
                 *++yystack.s_mark = yytable[yyn];
                 *++yystack.l_mark = yylval;
@@ -569,7 +565,7 @@ yyinrecovery:
 #if YYDEBUG
         if (yydebug)
         {
-            yys = yyname[YYTRANSLATE(yychar)];
+            if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
             printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
                     YYPREFIX, yystate, yychar, yys);
         }
@@ -585,32 +581,33 @@ yyreduce:
                 YYPREFIX, yystate, yyn, yyrule[yyn]);
 #endif
     yym = yylen[yyn];
-    if (yym)
+    if (yym > 0)
         yyval = yystack.l_mark[1-yym];
     else
         memset(&yyval, 0, sizeof yyval);
+
     switch (yyn)
     {
 case 6:
-#line 79 "../../freebsd/lib/libc/net/nsparser.y"
+#line 79 "nsparser.y"
 	{
 			free((char*)curdbt.name);
 		}
 break;
 case 7:
-#line 83 "../../freebsd/lib/libc/net/nsparser.y"
+#line 83 "nsparser.y"
 	{
 			_nsdbtput(&curdbt);
 		}
 break;
 case 8:
-#line 87 "../../freebsd/lib/libc/net/nsparser.y"
+#line 87 "nsparser.y"
 	{
 			yyerrok;
 		}
 break;
 case 9:
-#line 94 "../../freebsd/lib/libc/net/nsparser.y"
+#line 94 "nsparser.y"
 	{
 			curdbt.name = yylval.str;
 			curdbt.srclist = NULL;
@@ -618,24 +615,24 @@ case 9:
 		}
 break;
 case 12:
-#line 108 "../../freebsd/lib/libc/net/nsparser.y"
+#line 108 "nsparser.y"
 	{
 			cursrc.flags = NS_TERMINATE;
 			_nsaddsrctomap(yystack.l_mark[0].str);
 		}
 break;
 case 13:
-#line 112 "../../freebsd/lib/libc/net/nsparser.y"
+#line 112 "nsparser.y"
 	{ cursrc.flags = NS_SUCCESS; }
 break;
 case 14:
-#line 113 "../../freebsd/lib/libc/net/nsparser.y"
+#line 113 "nsparser.y"
 	{
 			_nsaddsrctomap(yystack.l_mark[-4].str);
 		}
 break;
 case 17:
-#line 125 "../../freebsd/lib/libc/net/nsparser.y"
+#line 125 "nsparser.y"
 	{
 			if (yystack.l_mark[0].mapval)	     /* if action == RETURN set RETURN bit */
 				cursrc.flags |= yystack.l_mark[-2].mapval;  
@@ -644,30 +641,30 @@ case 17:
 		}
 break;
 case 18:
-#line 134 "../../freebsd/lib/libc/net/nsparser.y"
+#line 134 "nsparser.y"
 	{ yyval.mapval = NS_SUCCESS; }
 break;
 case 19:
-#line 135 "../../freebsd/lib/libc/net/nsparser.y"
+#line 135 "nsparser.y"
 	{ yyval.mapval = NS_UNAVAIL; }
 break;
 case 20:
-#line 136 "../../freebsd/lib/libc/net/nsparser.y"
+#line 136 "nsparser.y"
 	{ yyval.mapval = NS_NOTFOUND; }
 break;
 case 21:
-#line 137 "../../freebsd/lib/libc/net/nsparser.y"
+#line 137 "nsparser.y"
 	{ yyval.mapval = NS_TRYAGAIN; }
 break;
 case 22:
-#line 141 "../../freebsd/lib/libc/net/nsparser.y"
+#line 141 "nsparser.y"
 	{ yyval.mapval = NS_ACTION_RETURN; }
 break;
 case 23:
-#line 142 "../../freebsd/lib/libc/net/nsparser.y"
+#line 142 "nsparser.y"
 	{ yyval.mapval = NS_ACTION_CONTINUE; }
 break;
-#line 671 "_nsyy.tab.c"
+#line 668 "nsparser.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
@@ -685,11 +682,12 @@ break;
         *++yystack.l_mark = yyval;
         if (yychar < 0)
         {
-            if ((yychar = YYLEX) < 0) yychar = YYEOF;
+            yychar = YYLEX;
+            if (yychar < 0) yychar = YYEOF;
 #if YYDEBUG
             if (yydebug)
             {
-                yys = yyname[YYTRANSLATE(yychar)];
+                if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
                 printf("%sdebug: state %d, reading %d (%s)\n",
                         YYPREFIX, YYFINAL, yychar, yys);
             }
@@ -698,8 +696,8 @@ break;
         if (yychar == YYEOF) goto yyaccept;
         goto yyloop;
     }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
+    if (((yyn = yygindex[yym]) != 0) && (yyn += yystate) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yystate)
         yystate = yytable[yyn];
     else
         yystate = yydgoto[yym];
@@ -708,10 +706,7 @@ break;
         printf("%sdebug: after reduction, shifting from state %d \
 to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
 #endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
-    {
-        goto yyoverflow;
-    }
+    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
     *++yystack.s_mark = (YYINT) yystate;
     *++yystack.l_mark = yyval;
     goto yyloop;
diff --git a/freebsd/sbin/pfctl/parse.c b/freebsd/sbin/pfctl/parse.c
index 6041735..cc87e81 100644
--- a/freebsd/sbin/pfctl/parse.c
+++ b/freebsd/sbin/pfctl/parse.c
@@ -97,7 +97,7 @@
 
 #define YYPURE 0
 
-#line 30 "../../freebsd/sbin/pfctl/parse.y"
+#line 30 "parse.y"
 #ifdef __rtems__
 #include <machine/rtems-bsd-user-space.h>
 #undef INET6
@@ -533,7 +533,7 @@ int	parseport(char *, struct range *r, int);
 	(!((addr).iflags & PFI_AFLAG_NOALIAS) ||		 \
 	!isdigit((addr).v.ifname[strlen((addr).v.ifname)-1])))
 
-#line 537 "pfctly.tab.c"
+#line 537 "parse.c"
 
 /* compatibility with bison */
 #ifdef YYPARSE_PARAM
@@ -2569,7 +2569,7 @@ typedef struct {
 } YYSTACKDATA;
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
-#line 4551 "../../freebsd/sbin/pfctl/parse.y"
+#line 4551 "parse.y"
 #ifdef __rtems__
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_pfctl, extern YYSTYPE pfctlyval);
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_pfctl, extern YYSTYPE pfctlylval);
@@ -4367,7 +4367,7 @@ rt_tableid_max(void)
 	return (RT_TABLEID_MAX);
 #endif
 }
-#line 4371 "pfctly.tab.c"
+#line 4371 "parse.c"
 
 #if YYDEBUG
 #include <stdio.h>	/* needed for printf */
@@ -4567,11 +4567,11 @@ yyreduce:
     switch (yyn)
     {
 case 17:
-#line 556 "../../freebsd/sbin/pfctl/parse.y"
+#line 556 "parse.y"
 	{ file->errors++; }
 break;
 case 18:
-#line 559 "../../freebsd/sbin/pfctl/parse.y"
+#line 559 "parse.y"
 	{
 			struct file	*nfile;
 
@@ -4587,7 +4587,7 @@ case 18:
 		}
 break;
 case 25:
-#line 586 "../../freebsd/sbin/pfctl/parse.y"
+#line 586 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "none"))
 				yyval.v.i = 0;
@@ -4602,7 +4602,7 @@ case 25:
 		}
 break;
 case 26:
-#line 600 "../../freebsd/sbin/pfctl/parse.y"
+#line 600 "parse.y"
 	{
 			if (check_rulestate(PFCTL_STATE_OPTION)) {
 				free(yystack.l_mark[0].v.string);
@@ -4617,7 +4617,7 @@ case 26:
 		}
 break;
 case 27:
-#line 612 "../../freebsd/sbin/pfctl/parse.y"
+#line 612 "parse.y"
 	{
 			if (!(pf->opts & PF_OPT_OPTIMIZE)) {
 				pf->opts |= PF_OPT_OPTIMIZE;
@@ -4626,7 +4626,7 @@ case 27:
 		}
 break;
 case 32:
-#line 622 "../../freebsd/sbin/pfctl/parse.y"
+#line 622 "parse.y"
 	{
 			if (check_rulestate(PFCTL_STATE_OPTION)) {
 				free(yystack.l_mark[0].v.string);
@@ -4641,7 +4641,7 @@ case 32:
 		}
 break;
 case 33:
-#line 634 "../../freebsd/sbin/pfctl/parse.y"
+#line 634 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number == 0 || yystack.l_mark[0].v.number > UINT_MAX) {
 				yyerror("hostid must be non-zero");
@@ -4654,7 +4654,7 @@ case 33:
 		}
 break;
 case 34:
-#line 644 "../../freebsd/sbin/pfctl/parse.y"
+#line 644 "parse.y"
 	{
 			if (pf->opts & PF_OPT_VERBOSE)
 				printf("set block-policy drop\n");
@@ -4664,7 +4664,7 @@ case 34:
 		}
 break;
 case 35:
-#line 651 "../../freebsd/sbin/pfctl/parse.y"
+#line 651 "parse.y"
 	{
 			if (pf->opts & PF_OPT_VERBOSE)
 				printf("set block-policy return\n");
@@ -4674,7 +4674,7 @@ case 35:
 		}
 break;
 case 36:
-#line 658 "../../freebsd/sbin/pfctl/parse.y"
+#line 658 "parse.y"
 	{
 			if (pf->opts & PF_OPT_VERBOSE)
 				printf("set require-order %s\n",
@@ -4683,7 +4683,7 @@ case 36:
 		}
 break;
 case 37:
-#line 664 "../../freebsd/sbin/pfctl/parse.y"
+#line 664 "parse.y"
 	{
 			if (pf->opts & PF_OPT_VERBOSE)
 				printf("set fingerprints \"%s\"\n", yystack.l_mark[0].v.string);
@@ -4704,7 +4704,7 @@ case 37:
 		}
 break;
 case 38:
-#line 682 "../../freebsd/sbin/pfctl/parse.y"
+#line 682 "parse.y"
 	{
 			if (pf->opts & PF_OPT_VERBOSE)
 				switch (yystack.l_mark[0].v.i) {
@@ -4719,7 +4719,7 @@ case 38:
 		}
 break;
 case 39:
-#line 694 "../../freebsd/sbin/pfctl/parse.y"
+#line 694 "parse.y"
 	{
 			if (check_rulestate(PFCTL_STATE_OPTION)) {
 				free(yystack.l_mark[0].v.string);
@@ -4734,7 +4734,7 @@ case 39:
 		}
 break;
 case 40:
-#line 706 "../../freebsd/sbin/pfctl/parse.y"
+#line 706 "parse.y"
 	{
 			if (expand_skip_interface(yystack.l_mark[0].v.interface) != 0) {
 				yyerror("error setting skip interface(s)");
@@ -4743,7 +4743,7 @@ case 40:
 		}
 break;
 case 41:
-#line 712 "../../freebsd/sbin/pfctl/parse.y"
+#line 712 "parse.y"
 	{
 			if (keep_state_defaults != NULL) {
 				yyerror("cannot redefine state-defaults");
@@ -4753,11 +4753,11 @@ case 41:
 		}
 break;
 case 42:
-#line 721 "../../freebsd/sbin/pfctl/parse.y"
+#line 721 "parse.y"
 	{ yyval.v.string = yystack.l_mark[0].v.string; }
 break;
 case 43:
-#line 722 "../../freebsd/sbin/pfctl/parse.y"
+#line 722 "parse.y"
 	{
 			if ((yyval.v.string = strdup("all")) == NULL) {
 				err(1, "stringall: strdup");
@@ -4765,7 +4765,7 @@ case 43:
 		}
 break;
 case 44:
-#line 729 "../../freebsd/sbin/pfctl/parse.y"
+#line 729 "parse.y"
 	{
 			if (asprintf(&yyval.v.string, "%s %s", yystack.l_mark[-1].v.string, yystack.l_mark[0].v.string) == -1)
 				err(1, "string: asprintf");
@@ -4774,7 +4774,7 @@ case 44:
 		}
 break;
 case 46:
-#line 738 "../../freebsd/sbin/pfctl/parse.y"
+#line 738 "parse.y"
 	{
 			if (asprintf(&yyval.v.string, "%s %s", yystack.l_mark[-1].v.string, yystack.l_mark[0].v.string) == -1)
 				err(1, "string: asprintf");
@@ -4783,7 +4783,7 @@ case 46:
 		}
 break;
 case 48:
-#line 747 "../../freebsd/sbin/pfctl/parse.y"
+#line 747 "parse.y"
 	{
 			char	*s;
 			if (asprintf(&s, "%lld", (long long)yystack.l_mark[0].v.number) == -1) {
@@ -4794,7 +4794,7 @@ case 48:
 		}
 break;
 case 50:
-#line 758 "../../freebsd/sbin/pfctl/parse.y"
+#line 758 "parse.y"
 	{
 			if (pf->opts & PF_OPT_VERBOSE)
 				printf("%s = \"%s\"\n", yystack.l_mark[-2].v.string, yystack.l_mark[0].v.string);
@@ -4805,15 +4805,15 @@ case 50:
 		}
 break;
 case 51:
-#line 768 "../../freebsd/sbin/pfctl/parse.y"
+#line 768 "parse.y"
 	{ yyval.v.string = yystack.l_mark[0].v.string; }
 break;
 case 52:
-#line 769 "../../freebsd/sbin/pfctl/parse.y"
+#line 769 "parse.y"
 	{ yyval.v.string = NULL; }
 break;
 case 57:
-#line 779 "../../freebsd/sbin/pfctl/parse.y"
+#line 779 "parse.y"
 	{
 			char ta[PF_ANCHOR_NAME_SIZE];
 			struct pf_ruleset *rs;
@@ -4833,7 +4833,7 @@ case 57:
 		}
 break;
 case 58:
-#line 796 "../../freebsd/sbin/pfctl/parse.y"
+#line 796 "parse.y"
 	{
 			pf->alast = pf->anchor;
 			pf->asd--;
@@ -4841,7 +4841,7 @@ case 58:
 		}
 break;
 case 60:
-#line 806 "../../freebsd/sbin/pfctl/parse.y"
+#line 806 "parse.y"
 	{
 			struct pf_rule	r;
 			struct node_proto	*proto;
@@ -4976,7 +4976,7 @@ case 60:
 		}
 break;
 case 61:
-#line 938 "../../freebsd/sbin/pfctl/parse.y"
+#line 938 "parse.y"
 	{
 			struct pf_rule	r;
 
@@ -5000,7 +5000,7 @@ case 61:
 		}
 break;
 case 62:
-#line 959 "../../freebsd/sbin/pfctl/parse.y"
+#line 959 "parse.y"
 	{
 			struct pf_rule	r;
 
@@ -5045,7 +5045,7 @@ case 62:
 		}
 break;
 case 63:
-#line 1001 "../../freebsd/sbin/pfctl/parse.y"
+#line 1001 "parse.y"
 	{
 			struct pf_rule	r;
 
@@ -5083,7 +5083,7 @@ case 63:
 		}
 break;
 case 64:
-#line 1038 "../../freebsd/sbin/pfctl/parse.y"
+#line 1038 "parse.y"
 	{
 			struct loadanchors	*loadanchor;
 
@@ -5116,7 +5116,7 @@ case 64:
 		}
 break;
 case 65:
-#line 1069 "../../freebsd/sbin/pfctl/parse.y"
+#line 1069 "parse.y"
 	{
 			yyval.v.b.b2 = yyval.v.b.w = 0;
 			if (yystack.l_mark[-1].v.i)
@@ -5126,7 +5126,7 @@ case 65:
 		}
 break;
 case 66:
-#line 1079 "../../freebsd/sbin/pfctl/parse.y"
+#line 1079 "parse.y"
 	{
 			struct pf_rule	r;
 
@@ -5184,18 +5184,18 @@ case 66:
 		}
 break;
 case 67:
-#line 1136 "../../freebsd/sbin/pfctl/parse.y"
+#line 1136 "parse.y"
 	{
 				bzero(&scrub_opts, sizeof scrub_opts);
 				scrub_opts.rtableid = -1;
 			}
 break;
 case 68:
-#line 1141 "../../freebsd/sbin/pfctl/parse.y"
+#line 1141 "parse.y"
 	{ yyval.v.scrub_opts = scrub_opts; }
 break;
 case 69:
-#line 1142 "../../freebsd/sbin/pfctl/parse.y"
+#line 1142 "parse.y"
 	{
 			bzero(&scrub_opts, sizeof scrub_opts);
 			scrub_opts.rtableid = -1;
@@ -5203,7 +5203,7 @@ case 69:
 		}
 break;
 case 72:
-#line 1153 "../../freebsd/sbin/pfctl/parse.y"
+#line 1153 "parse.y"
 	{
 			if (scrub_opts.nodf) {
 				yyerror("no-df cannot be respecified");
@@ -5213,7 +5213,7 @@ case 72:
 		}
 break;
 case 73:
-#line 1160 "../../freebsd/sbin/pfctl/parse.y"
+#line 1160 "parse.y"
 	{
 			if (scrub_opts.marker & SOM_MINTTL) {
 				yyerror("min-ttl cannot be respecified");
@@ -5228,7 +5228,7 @@ case 73:
 		}
 break;
 case 74:
-#line 1172 "../../freebsd/sbin/pfctl/parse.y"
+#line 1172 "parse.y"
 	{
 			if (scrub_opts.marker & SOM_MAXMSS) {
 				yyerror("max-mss cannot be respecified");
@@ -5243,7 +5243,7 @@ case 74:
 		}
 break;
 case 75:
-#line 1184 "../../freebsd/sbin/pfctl/parse.y"
+#line 1184 "parse.y"
 	{
 			if (scrub_opts.marker & SOM_SETTOS) {
 				yyerror("set-tos cannot be respecified");
@@ -5254,7 +5254,7 @@ case 75:
 		}
 break;
 case 76:
-#line 1192 "../../freebsd/sbin/pfctl/parse.y"
+#line 1192 "parse.y"
 	{
 			if (scrub_opts.marker & SOM_FRAGCACHE) {
 				yyerror("fragcache cannot be respecified");
@@ -5265,7 +5265,7 @@ case 76:
 		}
 break;
 case 77:
-#line 1200 "../../freebsd/sbin/pfctl/parse.y"
+#line 1200 "parse.y"
 	{
 			if (strcasecmp(yystack.l_mark[0].v.string, "tcp") != 0) {
 				yyerror("scrub reassemble supports only tcp, "
@@ -5282,7 +5282,7 @@ case 77:
 		}
 break;
 case 78:
-#line 1214 "../../freebsd/sbin/pfctl/parse.y"
+#line 1214 "parse.y"
 	{
 			if (scrub_opts.randomid) {
 				yyerror("random-id cannot be respecified");
@@ -5292,7 +5292,7 @@ case 78:
 		}
 break;
 case 79:
-#line 1221 "../../freebsd/sbin/pfctl/parse.y"
+#line 1221 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > rt_tableid_max()) {
 				yyerror("invalid rtable id");
@@ -5302,26 +5302,26 @@ case 79:
 		}
 break;
 case 80:
-#line 1228 "../../freebsd/sbin/pfctl/parse.y"
+#line 1228 "parse.y"
 	{
 			scrub_opts.match_tag = yystack.l_mark[0].v.string;
 			scrub_opts.match_tag_not = yystack.l_mark[-2].v.number;
 		}
 break;
 case 81:
-#line 1234 "../../freebsd/sbin/pfctl/parse.y"
+#line 1234 "parse.y"
 	{ yyval.v.i = 0; /* default */ }
 break;
 case 82:
-#line 1235 "../../freebsd/sbin/pfctl/parse.y"
+#line 1235 "parse.y"
 	{ yyval.v.i = 0; }
 break;
 case 83:
-#line 1236 "../../freebsd/sbin/pfctl/parse.y"
+#line 1236 "parse.y"
 	{ yyval.v.i = 0; }
 break;
 case 84:
-#line 1239 "../../freebsd/sbin/pfctl/parse.y"
+#line 1239 "parse.y"
 	{
 			struct pf_rule		 r;
 			struct node_host	*h = NULL, *hh;
@@ -5409,19 +5409,19 @@ case 84:
 		}
 break;
 case 85:
-#line 1326 "../../freebsd/sbin/pfctl/parse.y"
+#line 1326 "parse.y"
 	{ yyval.v.interface = yystack.l_mark[0].v.interface; }
 break;
 case 86:
-#line 1327 "../../freebsd/sbin/pfctl/parse.y"
+#line 1327 "parse.y"
 	{ yyval.v.interface = yystack.l_mark[-1].v.interface; }
 break;
 case 87:
-#line 1330 "../../freebsd/sbin/pfctl/parse.y"
+#line 1330 "parse.y"
 	{ yyval.v.interface = yystack.l_mark[-1].v.interface; }
 break;
 case 88:
-#line 1331 "../../freebsd/sbin/pfctl/parse.y"
+#line 1331 "parse.y"
 	{
 			yystack.l_mark[-3].v.interface->tail->next = yystack.l_mark[-1].v.interface;
 			yystack.l_mark[-3].v.interface->tail = yystack.l_mark[-1].v.interface;
@@ -5429,29 +5429,29 @@ case 88:
 		}
 break;
 case 89:
-#line 1338 "../../freebsd/sbin/pfctl/parse.y"
+#line 1338 "parse.y"
 	{ yyval.v.interface = yystack.l_mark[0].v.interface; }
 break;
 case 90:
-#line 1339 "../../freebsd/sbin/pfctl/parse.y"
+#line 1339 "parse.y"
 	{
 			yystack.l_mark[-1].v.interface->dynamic = 1;
 			yyval.v.interface = yystack.l_mark[-1].v.interface;
 		}
 break;
 case 91:
-#line 1345 "../../freebsd/sbin/pfctl/parse.y"
+#line 1345 "parse.y"
 	{
 				bzero(&antispoof_opts, sizeof antispoof_opts);
 				antispoof_opts.rtableid = -1;
 			}
 break;
 case 92:
-#line 1350 "../../freebsd/sbin/pfctl/parse.y"
+#line 1350 "parse.y"
 	{ yyval.v.antispoof_opts = antispoof_opts; }
 break;
 case 93:
-#line 1351 "../../freebsd/sbin/pfctl/parse.y"
+#line 1351 "parse.y"
 	{
 			bzero(&antispoof_opts, sizeof antispoof_opts);
 			antispoof_opts.rtableid = -1;
@@ -5459,7 +5459,7 @@ case 93:
 		}
 break;
 case 96:
-#line 1362 "../../freebsd/sbin/pfctl/parse.y"
+#line 1362 "parse.y"
 	{
 			if (antispoof_opts.label) {
 				yyerror("label cannot be redefined");
@@ -5469,7 +5469,7 @@ case 96:
 		}
 break;
 case 97:
-#line 1369 "../../freebsd/sbin/pfctl/parse.y"
+#line 1369 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > rt_tableid_max()) {
 				yyerror("invalid rtable id");
@@ -5479,15 +5479,15 @@ case 97:
 		}
 break;
 case 98:
-#line 1378 "../../freebsd/sbin/pfctl/parse.y"
+#line 1378 "parse.y"
 	{ yyval.v.number = 1; }
 break;
 case 99:
-#line 1379 "../../freebsd/sbin/pfctl/parse.y"
+#line 1379 "parse.y"
 	{ yyval.v.number = 0; }
 break;
 case 100:
-#line 1382 "../../freebsd/sbin/pfctl/parse.y"
+#line 1382 "parse.y"
 	{
 			struct node_host	 *h, *nh;
 			struct node_tinit	 *ti, *nti;
@@ -5518,18 +5518,18 @@ case 100:
 		}
 break;
 case 101:
-#line 1412 "../../freebsd/sbin/pfctl/parse.y"
+#line 1412 "parse.y"
 	{
 			bzero(&table_opts, sizeof table_opts);
 			SIMPLEQ_INIT(&table_opts.init_nodes);
 		}
 break;
 case 102:
-#line 1417 "../../freebsd/sbin/pfctl/parse.y"
+#line 1417 "parse.y"
 	{ yyval.v.table_opts = table_opts; }
 break;
 case 103:
-#line 1419 "../../freebsd/sbin/pfctl/parse.y"
+#line 1419 "parse.y"
 	{
 			bzero(&table_opts, sizeof table_opts);
 			SIMPLEQ_INIT(&table_opts.init_nodes);
@@ -5537,7 +5537,7 @@ case 103:
 		}
 break;
 case 106:
-#line 1430 "../../freebsd/sbin/pfctl/parse.y"
+#line 1430 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "const"))
 				table_opts.flags |= PFR_TFLAG_CONST;
@@ -5554,11 +5554,11 @@ case 106:
 		}
 break;
 case 107:
-#line 1444 "../../freebsd/sbin/pfctl/parse.y"
+#line 1444 "parse.y"
 	{ table_opts.init_addr = 1; }
 break;
 case 108:
-#line 1445 "../../freebsd/sbin/pfctl/parse.y"
+#line 1445 "parse.y"
 	{
 			struct node_host	*n;
 			struct node_tinit	*ti;
@@ -5601,7 +5601,7 @@ case 108:
 		}
 break;
 case 109:
-#line 1485 "../../freebsd/sbin/pfctl/parse.y"
+#line 1485 "parse.y"
 	{
 			struct node_tinit	*ti;
 
@@ -5614,7 +5614,7 @@ case 109:
 		}
 break;
 case 110:
-#line 1497 "../../freebsd/sbin/pfctl/parse.y"
+#line 1497 "parse.y"
 	{
 			struct pf_altq	a;
 
@@ -5639,7 +5639,7 @@ case 110:
 		}
 break;
 case 111:
-#line 1521 "../../freebsd/sbin/pfctl/parse.y"
+#line 1521 "parse.y"
 	{
 			struct pf_altq	a;
 
@@ -5677,7 +5677,7 @@ case 111:
 		}
 break;
 case 112:
-#line 1558 "../../freebsd/sbin/pfctl/parse.y"
+#line 1558 "parse.y"
 	{
 			bzero(&queue_opts, sizeof queue_opts);
 			queue_opts.priority = DEFAULT_PRIORITY;
@@ -5687,11 +5687,11 @@ case 112:
 		}
 break;
 case 113:
-#line 1566 "../../freebsd/sbin/pfctl/parse.y"
+#line 1566 "parse.y"
 	{ yyval.v.queue_opts = queue_opts; }
 break;
 case 114:
-#line 1567 "../../freebsd/sbin/pfctl/parse.y"
+#line 1567 "parse.y"
 	{
 			bzero(&queue_opts, sizeof queue_opts);
 			queue_opts.priority = DEFAULT_PRIORITY;
@@ -5702,7 +5702,7 @@ case 114:
 		}
 break;
 case 117:
-#line 1581 "../../freebsd/sbin/pfctl/parse.y"
+#line 1581 "parse.y"
 	{
 			if (queue_opts.marker & QOM_BWSPEC) {
 				yyerror("bandwidth cannot be respecified");
@@ -5713,7 +5713,7 @@ case 117:
 		}
 break;
 case 118:
-#line 1589 "../../freebsd/sbin/pfctl/parse.y"
+#line 1589 "parse.y"
 	{
 			if (queue_opts.marker & QOM_PRIORITY) {
 				yyerror("priority cannot be respecified");
@@ -5728,7 +5728,7 @@ case 118:
 		}
 break;
 case 119:
-#line 1601 "../../freebsd/sbin/pfctl/parse.y"
+#line 1601 "parse.y"
 	{
 			if (queue_opts.marker & QOM_QLIMIT) {
 				yyerror("qlimit cannot be respecified");
@@ -5743,7 +5743,7 @@ case 119:
 		}
 break;
 case 120:
-#line 1613 "../../freebsd/sbin/pfctl/parse.y"
+#line 1613 "parse.y"
 	{
 			if (queue_opts.marker & QOM_SCHEDULER) {
 				yyerror("scheduler cannot be respecified");
@@ -5754,7 +5754,7 @@ case 120:
 		}
 break;
 case 121:
-#line 1621 "../../freebsd/sbin/pfctl/parse.y"
+#line 1621 "parse.y"
 	{
 			if (queue_opts.marker & QOM_TBRSIZE) {
 				yyerror("tbrsize cannot be respecified");
@@ -5769,7 +5769,7 @@ case 121:
 		}
 break;
 case 122:
-#line 1635 "../../freebsd/sbin/pfctl/parse.y"
+#line 1635 "parse.y"
 	{
 			double	 bps;
 			char	*cp;
@@ -5815,7 +5815,7 @@ case 122:
 		}
 break;
 case 123:
-#line 1678 "../../freebsd/sbin/pfctl/parse.y"
+#line 1678 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
 				yyerror("bandwidth number too big");
@@ -5826,35 +5826,35 @@ case 123:
 		}
 break;
 case 124:
-#line 1688 "../../freebsd/sbin/pfctl/parse.y"
+#line 1688 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_CBQ;
 			yyval.v.queue_options.data.cbq_opts.flags = 0;
 		}
 break;
 case 125:
-#line 1692 "../../freebsd/sbin/pfctl/parse.y"
+#line 1692 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_CBQ;
 			yyval.v.queue_options.data.cbq_opts.flags = yystack.l_mark[-1].v.number;
 		}
 break;
 case 126:
-#line 1696 "../../freebsd/sbin/pfctl/parse.y"
+#line 1696 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_PRIQ;
 			yyval.v.queue_options.data.priq_opts.flags = 0;
 		}
 break;
 case 127:
-#line 1700 "../../freebsd/sbin/pfctl/parse.y"
+#line 1700 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_PRIQ;
 			yyval.v.queue_options.data.priq_opts.flags = yystack.l_mark[-1].v.number;
 		}
 break;
 case 128:
-#line 1704 "../../freebsd/sbin/pfctl/parse.y"
+#line 1704 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_HFSC;
 			bzero(&yyval.v.queue_options.data.hfsc_opts,
@@ -5862,14 +5862,14 @@ case 128:
 		}
 break;
 case 129:
-#line 1709 "../../freebsd/sbin/pfctl/parse.y"
+#line 1709 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_HFSC;
 			yyval.v.queue_options.data.hfsc_opts = yystack.l_mark[-1].v.hfsc_opts;
 		}
 break;
 case 130:
-#line 1713 "../../freebsd/sbin/pfctl/parse.y"
+#line 1713 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_FAIRQ;
 			bzero(&yyval.v.queue_options.data.fairq_opts,
@@ -5877,14 +5877,14 @@ case 130:
 		}
 break;
 case 131:
-#line 1718 "../../freebsd/sbin/pfctl/parse.y"
+#line 1718 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_FAIRQ;
 			yyval.v.queue_options.data.fairq_opts = yystack.l_mark[-1].v.fairq_opts;
 		}
 break;
 case 132:
-#line 1722 "../../freebsd/sbin/pfctl/parse.y"
+#line 1722 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_CODEL;
 			bzero(&yyval.v.queue_options.data.codel_opts,
@@ -5892,22 +5892,22 @@ case 132:
 		}
 break;
 case 133:
-#line 1727 "../../freebsd/sbin/pfctl/parse.y"
+#line 1727 "parse.y"
 	{
 			yyval.v.queue_options.qtype = ALTQT_CODEL;
 			yyval.v.queue_options.data.codel_opts = yystack.l_mark[-1].v.codel_opts;
 		}
 break;
 case 134:
-#line 1733 "../../freebsd/sbin/pfctl/parse.y"
+#line 1733 "parse.y"
 	{ yyval.v.number |= yystack.l_mark[0].v.number; }
 break;
 case 135:
-#line 1734 "../../freebsd/sbin/pfctl/parse.y"
+#line 1734 "parse.y"
 	{ yyval.v.number |= yystack.l_mark[0].v.number; }
 break;
 case 136:
-#line 1737 "../../freebsd/sbin/pfctl/parse.y"
+#line 1737 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "default"))
 				yyval.v.number = CBQCLF_DEFCLASS;
@@ -5930,15 +5930,15 @@ case 136:
 		}
 break;
 case 137:
-#line 1759 "../../freebsd/sbin/pfctl/parse.y"
+#line 1759 "parse.y"
 	{ yyval.v.number |= yystack.l_mark[0].v.number; }
 break;
 case 138:
-#line 1760 "../../freebsd/sbin/pfctl/parse.y"
+#line 1760 "parse.y"
 	{ yyval.v.number |= yystack.l_mark[0].v.number; }
 break;
 case 139:
-#line 1763 "../../freebsd/sbin/pfctl/parse.y"
+#line 1763 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "default"))
 				yyval.v.number = PRCF_DEFAULTCLASS;
@@ -5959,20 +5959,20 @@ case 139:
 		}
 break;
 case 140:
-#line 1783 "../../freebsd/sbin/pfctl/parse.y"
+#line 1783 "parse.y"
 	{
 				bzero(&hfsc_opts,
 				    sizeof(struct node_hfsc_opts));
 			}
 break;
 case 141:
-#line 1787 "../../freebsd/sbin/pfctl/parse.y"
+#line 1787 "parse.y"
 	{
 			yyval.v.hfsc_opts = hfsc_opts;
 		}
 break;
 case 144:
-#line 1796 "../../freebsd/sbin/pfctl/parse.y"
+#line 1796 "parse.y"
 	{
 			if (hfsc_opts.linkshare.used) {
 				yyerror("linkshare already specified");
@@ -5983,7 +5983,7 @@ case 144:
 		}
 break;
 case 145:
-#line 1805 "../../freebsd/sbin/pfctl/parse.y"
+#line 1805 "parse.y"
 	{
 			if (yystack.l_mark[-3].v.number < 0 || yystack.l_mark[-3].v.number > INT_MAX) {
 				yyerror("timing in curve out of range");
@@ -6000,7 +6000,7 @@ case 145:
 		}
 break;
 case 146:
-#line 1819 "../../freebsd/sbin/pfctl/parse.y"
+#line 1819 "parse.y"
 	{
 			if (hfsc_opts.realtime.used) {
 				yyerror("realtime already specified");
@@ -6011,7 +6011,7 @@ case 146:
 		}
 break;
 case 147:
-#line 1828 "../../freebsd/sbin/pfctl/parse.y"
+#line 1828 "parse.y"
 	{
 			if (yystack.l_mark[-3].v.number < 0 || yystack.l_mark[-3].v.number > INT_MAX) {
 				yyerror("timing in curve out of range");
@@ -6028,7 +6028,7 @@ case 147:
 		}
 break;
 case 148:
-#line 1842 "../../freebsd/sbin/pfctl/parse.y"
+#line 1842 "parse.y"
 	{
 			if (hfsc_opts.upperlimit.used) {
 				yyerror("upperlimit already specified");
@@ -6039,7 +6039,7 @@ case 148:
 		}
 break;
 case 149:
-#line 1851 "../../freebsd/sbin/pfctl/parse.y"
+#line 1851 "parse.y"
 	{
 			if (yystack.l_mark[-3].v.number < 0 || yystack.l_mark[-3].v.number > INT_MAX) {
 				yyerror("timing in curve out of range");
@@ -6056,7 +6056,7 @@ case 149:
 		}
 break;
 case 150:
-#line 1865 "../../freebsd/sbin/pfctl/parse.y"
+#line 1865 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "default"))
 				hfsc_opts.flags |= HFCF_DEFAULTCLASS;
@@ -6077,20 +6077,20 @@ case 150:
 		}
 break;
 case 151:
-#line 1885 "../../freebsd/sbin/pfctl/parse.y"
+#line 1885 "parse.y"
 	{
 				bzero(&fairq_opts,
 				    sizeof(struct node_fairq_opts));
 			}
 break;
 case 152:
-#line 1889 "../../freebsd/sbin/pfctl/parse.y"
+#line 1889 "parse.y"
 	{
 			yyval.v.fairq_opts = fairq_opts;
 		}
 break;
 case 155:
-#line 1898 "../../freebsd/sbin/pfctl/parse.y"
+#line 1898 "parse.y"
 	{
 			if (fairq_opts.linkshare.used) {
 				yyerror("linkshare already specified");
@@ -6101,7 +6101,7 @@ case 155:
 		}
 break;
 case 156:
-#line 1906 "../../freebsd/sbin/pfctl/parse.y"
+#line 1906 "parse.y"
 	{
 			if (fairq_opts.linkshare.used) {
 				yyerror("linkshare already specified");
@@ -6114,19 +6114,19 @@ case 156:
 		}
 break;
 case 157:
-#line 1916 "../../freebsd/sbin/pfctl/parse.y"
+#line 1916 "parse.y"
 	{
 			fairq_opts.hogs_bw = yystack.l_mark[0].v.queue_bwspec;
 		}
 break;
 case 158:
-#line 1919 "../../freebsd/sbin/pfctl/parse.y"
+#line 1919 "parse.y"
 	{
 			fairq_opts.nbuckets = yystack.l_mark[0].v.number;
 		}
 break;
 case 159:
-#line 1922 "../../freebsd/sbin/pfctl/parse.y"
+#line 1922 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "default"))
 				fairq_opts.flags |= FARF_DEFAULTCLASS;
@@ -6147,20 +6147,20 @@ case 159:
 		}
 break;
 case 160:
-#line 1942 "../../freebsd/sbin/pfctl/parse.y"
+#line 1942 "parse.y"
 	{
 				bzero(&codel_opts,
 				    sizeof(struct codel_opts));
 			}
 break;
 case 161:
-#line 1946 "../../freebsd/sbin/pfctl/parse.y"
+#line 1946 "parse.y"
 	{
 			yyval.v.codel_opts = codel_opts;
 		}
 break;
 case 164:
-#line 1955 "../../freebsd/sbin/pfctl/parse.y"
+#line 1955 "parse.y"
 	{
 			if (codel_opts.interval) {
 				yyerror("interval already specified");
@@ -6170,7 +6170,7 @@ case 164:
 		}
 break;
 case 165:
-#line 1962 "../../freebsd/sbin/pfctl/parse.y"
+#line 1962 "parse.y"
 	{
 			if (codel_opts.target) {
 				yyerror("target already specified");
@@ -6180,7 +6180,7 @@ case 165:
 		}
 break;
 case 166:
-#line 1969 "../../freebsd/sbin/pfctl/parse.y"
+#line 1969 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "ecn"))
 				codel_opts.ecn = 1;
@@ -6193,23 +6193,23 @@ case 166:
 		}
 break;
 case 167:
-#line 1981 "../../freebsd/sbin/pfctl/parse.y"
+#line 1981 "parse.y"
 	{ yyval.v.queue = NULL; }
 break;
 case 168:
-#line 1982 "../../freebsd/sbin/pfctl/parse.y"
+#line 1982 "parse.y"
 	{ yyval.v.queue = yystack.l_mark[0].v.queue; }
 break;
 case 169:
-#line 1983 "../../freebsd/sbin/pfctl/parse.y"
+#line 1983 "parse.y"
 	{ yyval.v.queue = yystack.l_mark[-1].v.queue; }
 break;
 case 170:
-#line 1986 "../../freebsd/sbin/pfctl/parse.y"
+#line 1986 "parse.y"
 	{ yyval.v.queue = yystack.l_mark[-1].v.queue; }
 break;
 case 171:
-#line 1987 "../../freebsd/sbin/pfctl/parse.y"
+#line 1987 "parse.y"
 	{
 			yystack.l_mark[-3].v.queue->tail->next = yystack.l_mark[-1].v.queue;
 			yystack.l_mark[-3].v.queue->tail = yystack.l_mark[-1].v.queue;
@@ -6217,7 +6217,7 @@ case 171:
 		}
 break;
 case 172:
-#line 1994 "../../freebsd/sbin/pfctl/parse.y"
+#line 1994 "parse.y"
 	{
 			yyval.v.queue = calloc(1, sizeof(struct node_queue));
 			if (yyval.v.queue == NULL)
@@ -6236,7 +6236,7 @@ case 172:
 		}
 break;
 case 173:
-#line 2014 "../../freebsd/sbin/pfctl/parse.y"
+#line 2014 "parse.y"
 	{
 			struct pf_rule		 r;
 			struct node_state_opt	*o;
@@ -6661,18 +6661,18 @@ case 173:
 		}
 break;
 case 174:
-#line 2438 "../../freebsd/sbin/pfctl/parse.y"
+#line 2438 "parse.y"
 	{
 				bzero(&filter_opts, sizeof filter_opts);
 				filter_opts.rtableid = -1;
 			}
 break;
 case 175:
-#line 2443 "../../freebsd/sbin/pfctl/parse.y"
+#line 2443 "parse.y"
 	{ yyval.v.filter_opts = filter_opts; }
 break;
 case 176:
-#line 2444 "../../freebsd/sbin/pfctl/parse.y"
+#line 2444 "parse.y"
 	{
 			bzero(&filter_opts, sizeof filter_opts);
 			filter_opts.rtableid = -1;
@@ -6680,7 +6680,7 @@ case 176:
 		}
 break;
 case 179:
-#line 2455 "../../freebsd/sbin/pfctl/parse.y"
+#line 2455 "parse.y"
 	{
 			if (filter_opts.uid)
 				yystack.l_mark[0].v.uid->tail->next = filter_opts.uid;
@@ -6688,7 +6688,7 @@ case 179:
 		}
 break;
 case 180:
-#line 2460 "../../freebsd/sbin/pfctl/parse.y"
+#line 2460 "parse.y"
 	{
 			if (filter_opts.gid)
 				yystack.l_mark[0].v.gid->tail->next = filter_opts.gid;
@@ -6696,7 +6696,7 @@ case 180:
 		}
 break;
 case 181:
-#line 2465 "../../freebsd/sbin/pfctl/parse.y"
+#line 2465 "parse.y"
 	{
 			if (filter_opts.marker & FOM_FLAGS) {
 				yyerror("flags cannot be redefined");
@@ -6710,7 +6710,7 @@ case 181:
 		}
 break;
 case 182:
-#line 2476 "../../freebsd/sbin/pfctl/parse.y"
+#line 2476 "parse.y"
 	{
 			if (filter_opts.marker & FOM_ICMP) {
 				yyerror("icmp-type cannot be redefined");
@@ -6721,7 +6721,7 @@ case 182:
 		}
 break;
 case 183:
-#line 2484 "../../freebsd/sbin/pfctl/parse.y"
+#line 2484 "parse.y"
 	{
 			if (filter_opts.marker & FOM_PRIO) {
 				yyerror("prio cannot be redefined");
@@ -6736,7 +6736,7 @@ case 183:
 		}
 break;
 case 184:
-#line 2496 "../../freebsd/sbin/pfctl/parse.y"
+#line 2496 "parse.y"
 	{
 			if (filter_opts.marker & FOM_TOS) {
 				yyerror("tos cannot be redefined");
@@ -6747,7 +6747,7 @@ case 184:
 		}
 break;
 case 185:
-#line 2504 "../../freebsd/sbin/pfctl/parse.y"
+#line 2504 "parse.y"
 	{
 			if (filter_opts.marker & FOM_KEEP) {
 				yyerror("modulate or keep cannot be redefined");
@@ -6759,19 +6759,19 @@ case 185:
 		}
 break;
 case 186:
-#line 2513 "../../freebsd/sbin/pfctl/parse.y"
+#line 2513 "parse.y"
 	{
 			filter_opts.fragment = 1;
 		}
 break;
 case 187:
-#line 2516 "../../freebsd/sbin/pfctl/parse.y"
+#line 2516 "parse.y"
 	{
 			filter_opts.allowopts = 1;
 		}
 break;
 case 188:
-#line 2519 "../../freebsd/sbin/pfctl/parse.y"
+#line 2519 "parse.y"
 	{
 			if (filter_opts.label) {
 				yyerror("label cannot be redefined");
@@ -6781,7 +6781,7 @@ case 188:
 		}
 break;
 case 189:
-#line 2526 "../../freebsd/sbin/pfctl/parse.y"
+#line 2526 "parse.y"
 	{
 			if (filter_opts.queues.qname) {
 				yyerror("queue cannot be redefined");
@@ -6791,20 +6791,20 @@ case 189:
 		}
 break;
 case 190:
-#line 2533 "../../freebsd/sbin/pfctl/parse.y"
+#line 2533 "parse.y"
 	{
 			filter_opts.tag = yystack.l_mark[0].v.string;
 		}
 break;
 case 191:
-#line 2536 "../../freebsd/sbin/pfctl/parse.y"
+#line 2536 "parse.y"
 	{
 			filter_opts.match_tag = yystack.l_mark[0].v.string;
 			filter_opts.match_tag_not = yystack.l_mark[-2].v.number;
 		}
 break;
 case 192:
-#line 2540 "../../freebsd/sbin/pfctl/parse.y"
+#line 2540 "parse.y"
 	{
 			double	p;
 
@@ -6819,7 +6819,7 @@ case 192:
 		}
 break;
 case 193:
-#line 2552 "../../freebsd/sbin/pfctl/parse.y"
+#line 2552 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > rt_tableid_max()) {
 				yyerror("invalid rtable id");
@@ -6829,7 +6829,7 @@ case 193:
 		}
 break;
 case 194:
-#line 2559 "../../freebsd/sbin/pfctl/parse.y"
+#line 2559 "parse.y"
 	{
 #ifdef __FreeBSD__
 			filter_opts.divert.port = yystack.l_mark[0].v.range.a;
@@ -6841,7 +6841,7 @@ case 194:
 		}
 break;
 case 195:
-#line 2568 "../../freebsd/sbin/pfctl/parse.y"
+#line 2568 "parse.y"
 	{
 #ifndef __FreeBSD__
 			if ((filter_opts.divert.addr = host(yystack.l_mark[-2].v.string)) == NULL) {
@@ -6862,7 +6862,7 @@ case 195:
 		}
 break;
 case 196:
-#line 2586 "../../freebsd/sbin/pfctl/parse.y"
+#line 2586 "parse.y"
 	{
 #ifdef __FreeBSD__
 			yyerror("divert-reply has no meaning in FreeBSD pf(4)");
@@ -6873,15 +6873,15 @@ case 196:
 		}
 break;
 case 198:
-#line 2597 "../../freebsd/sbin/pfctl/parse.y"
+#line 2597 "parse.y"
 	{ yyval.v.filter_opts = filter_opts; }
 break;
 case 199:
-#line 2598 "../../freebsd/sbin/pfctl/parse.y"
+#line 2598 "parse.y"
 	{ yyval.v.filter_opts = filter_opts; }
 break;
 case 202:
-#line 2605 "../../freebsd/sbin/pfctl/parse.y"
+#line 2605 "parse.y"
 	{
 			if (filter_opts.marker & FOM_SETPRIO) {
 				yyerror("prio cannot be redefined");
@@ -6893,7 +6893,7 @@ case 202:
 		}
 break;
 case 203:
-#line 2614 "../../freebsd/sbin/pfctl/parse.y"
+#line 2614 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > PF_PRIO_MAX) {
 				yyerror("prio must be 0 - %u", PF_PRIO_MAX);
@@ -6903,7 +6903,7 @@ case 203:
 		}
 break;
 case 204:
-#line 2621 "../../freebsd/sbin/pfctl/parse.y"
+#line 2621 "parse.y"
 	{
 			if (yystack.l_mark[-3].v.number < 0 || yystack.l_mark[-3].v.number > PF_PRIO_MAX ||
 			    yystack.l_mark[-1].v.number < 0 || yystack.l_mark[-1].v.number > PF_PRIO_MAX) {
@@ -6915,7 +6915,7 @@ case 204:
 		}
 break;
 case 205:
-#line 2632 "../../freebsd/sbin/pfctl/parse.y"
+#line 2632 "parse.y"
 	{
 			char	*e;
 			double	 p = strtod(yystack.l_mark[0].v.string, &e);
@@ -6934,21 +6934,21 @@ case 205:
 		}
 break;
 case 206:
-#line 2648 "../../freebsd/sbin/pfctl/parse.y"
+#line 2648 "parse.y"
 	{
 			yyval.v.probability = (double)yystack.l_mark[0].v.number;
 		}
 break;
 case 207:
-#line 2654 "../../freebsd/sbin/pfctl/parse.y"
+#line 2654 "parse.y"
 	{ yyval.v.b.b1 = PF_PASS; yyval.v.b.b2 = yyval.v.b.w = 0; }
 break;
 case 208:
-#line 2655 "../../freebsd/sbin/pfctl/parse.y"
+#line 2655 "parse.y"
 	{ yyval.v.b = yystack.l_mark[0].v.b; yyval.v.b.b1 = PF_DROP; }
 break;
 case 209:
-#line 2658 "../../freebsd/sbin/pfctl/parse.y"
+#line 2658 "parse.y"
 	{
 			yyval.v.b.b2 = blockpolicy;
 			yyval.v.b.w = returnicmpdefault;
@@ -6956,7 +6956,7 @@ case 209:
 		}
 break;
 case 210:
-#line 2663 "../../freebsd/sbin/pfctl/parse.y"
+#line 2663 "parse.y"
 	{
 			yyval.v.b.b2 = PFRULE_DROP;
 			yyval.v.b.w = 0;
@@ -6964,7 +6964,7 @@ case 210:
 		}
 break;
 case 211:
-#line 2668 "../../freebsd/sbin/pfctl/parse.y"
+#line 2668 "parse.y"
 	{
 			yyval.v.b.b2 = PFRULE_RETURNRST;
 			yyval.v.b.w = 0;
@@ -6972,7 +6972,7 @@ case 211:
 		}
 break;
 case 212:
-#line 2673 "../../freebsd/sbin/pfctl/parse.y"
+#line 2673 "parse.y"
 	{
 			if (yystack.l_mark[-1].v.number < 0 || yystack.l_mark[-1].v.number > 255) {
 				yyerror("illegal ttl value %d", yystack.l_mark[-1].v.number);
@@ -6984,7 +6984,7 @@ case 212:
 		}
 break;
 case 213:
-#line 2682 "../../freebsd/sbin/pfctl/parse.y"
+#line 2682 "parse.y"
 	{
 			yyval.v.b.b2 = PFRULE_RETURNICMP;
 			yyval.v.b.w = returnicmpdefault;
@@ -6992,7 +6992,7 @@ case 213:
 		}
 break;
 case 214:
-#line 2687 "../../freebsd/sbin/pfctl/parse.y"
+#line 2687 "parse.y"
 	{
 			yyval.v.b.b2 = PFRULE_RETURNICMP;
 			yyval.v.b.w = returnicmpdefault;
@@ -7000,7 +7000,7 @@ case 214:
 		}
 break;
 case 215:
-#line 2692 "../../freebsd/sbin/pfctl/parse.y"
+#line 2692 "parse.y"
 	{
 			yyval.v.b.b2 = PFRULE_RETURNICMP;
 			yyval.v.b.w = yystack.l_mark[-1].v.number;
@@ -7008,7 +7008,7 @@ case 215:
 		}
 break;
 case 216:
-#line 2697 "../../freebsd/sbin/pfctl/parse.y"
+#line 2697 "parse.y"
 	{
 			yyval.v.b.b2 = PFRULE_RETURNICMP;
 			yyval.v.b.w = returnicmpdefault;
@@ -7016,7 +7016,7 @@ case 216:
 		}
 break;
 case 217:
-#line 2702 "../../freebsd/sbin/pfctl/parse.y"
+#line 2702 "parse.y"
 	{
 			yyval.v.b.b2 = PFRULE_RETURNICMP;
 			yyval.v.b.w = yystack.l_mark[-3].v.number;
@@ -7024,7 +7024,7 @@ case 217:
 		}
 break;
 case 218:
-#line 2707 "../../freebsd/sbin/pfctl/parse.y"
+#line 2707 "parse.y"
 	{
 			yyval.v.b.b2 = PFRULE_RETURN;
 			yyval.v.b.w = returnicmpdefault;
@@ -7032,7 +7032,7 @@ case 218:
 		}
 break;
 case 219:
-#line 2714 "../../freebsd/sbin/pfctl/parse.y"
+#line 2714 "parse.y"
 	{
 			if (!(yyval.v.number = parseicmpspec(yystack.l_mark[0].v.string, AF_INET))) {
 				free(yystack.l_mark[0].v.string);
@@ -7042,7 +7042,7 @@ case 219:
 		}
 break;
 case 220:
-#line 2721 "../../freebsd/sbin/pfctl/parse.y"
+#line 2721 "parse.y"
 	{
 			u_int8_t		icmptype;
 
@@ -7055,7 +7055,7 @@ case 220:
 		}
 break;
 case 221:
-#line 2733 "../../freebsd/sbin/pfctl/parse.y"
+#line 2733 "parse.y"
 	{
 			if (!(yyval.v.number = parseicmpspec(yystack.l_mark[0].v.string, AF_INET6))) {
 				free(yystack.l_mark[0].v.string);
@@ -7065,7 +7065,7 @@ case 221:
 		}
 break;
 case 222:
-#line 2740 "../../freebsd/sbin/pfctl/parse.y"
+#line 2740 "parse.y"
 	{
 			u_int8_t		icmptype;
 
@@ -7078,62 +7078,62 @@ case 222:
 		}
 break;
 case 223:
-#line 2752 "../../freebsd/sbin/pfctl/parse.y"
+#line 2752 "parse.y"
 	{ yyval.v.i = PF_INOUT; }
 break;
 case 224:
-#line 2753 "../../freebsd/sbin/pfctl/parse.y"
+#line 2753 "parse.y"
 	{ yyval.v.i = PF_IN; }
 break;
 case 225:
-#line 2754 "../../freebsd/sbin/pfctl/parse.y"
+#line 2754 "parse.y"
 	{ yyval.v.i = PF_OUT; }
 break;
 case 226:
-#line 2757 "../../freebsd/sbin/pfctl/parse.y"
+#line 2757 "parse.y"
 	{ yyval.v.logquick.quick = 0; }
 break;
 case 227:
-#line 2758 "../../freebsd/sbin/pfctl/parse.y"
+#line 2758 "parse.y"
 	{ yyval.v.logquick.quick = 1; }
 break;
 case 228:
-#line 2761 "../../freebsd/sbin/pfctl/parse.y"
+#line 2761 "parse.y"
 	{ yyval.v.logquick.log = 0; yyval.v.logquick.quick = 0; yyval.v.logquick.logif = 0; }
 break;
 case 229:
-#line 2762 "../../freebsd/sbin/pfctl/parse.y"
+#line 2762 "parse.y"
 	{ yyval.v.logquick = yystack.l_mark[0].v.logquick; yyval.v.logquick.quick = 0; }
 break;
 case 230:
-#line 2763 "../../freebsd/sbin/pfctl/parse.y"
+#line 2763 "parse.y"
 	{ yyval.v.logquick.quick = 1; yyval.v.logquick.log = 0; yyval.v.logquick.logif = 0; }
 break;
 case 231:
-#line 2764 "../../freebsd/sbin/pfctl/parse.y"
+#line 2764 "parse.y"
 	{ yyval.v.logquick = yystack.l_mark[-1].v.logquick; yyval.v.logquick.quick = 1; }
 break;
 case 232:
-#line 2765 "../../freebsd/sbin/pfctl/parse.y"
+#line 2765 "parse.y"
 	{ yyval.v.logquick = yystack.l_mark[0].v.logquick; yyval.v.logquick.quick = 1; }
 break;
 case 233:
-#line 2768 "../../freebsd/sbin/pfctl/parse.y"
+#line 2768 "parse.y"
 	{ yyval.v.logquick.log = PF_LOG; yyval.v.logquick.logif = 0; }
 break;
 case 234:
-#line 2769 "../../freebsd/sbin/pfctl/parse.y"
+#line 2769 "parse.y"
 	{
 			yyval.v.logquick.log = PF_LOG | yystack.l_mark[-1].v.logquick.log;
 			yyval.v.logquick.logif = yystack.l_mark[-1].v.logquick.logif;
 		}
 break;
 case 235:
-#line 2775 "../../freebsd/sbin/pfctl/parse.y"
+#line 2775 "parse.y"
 	{ yyval.v.logquick = yystack.l_mark[0].v.logquick; }
 break;
 case 236:
-#line 2776 "../../freebsd/sbin/pfctl/parse.y"
+#line 2776 "parse.y"
 	{
 			yyval.v.logquick.log = yystack.l_mark[-2].v.logquick.log | yystack.l_mark[0].v.logquick.log;
 			yyval.v.logquick.logif = yystack.l_mark[0].v.logquick.logif;
@@ -7142,19 +7142,19 @@ case 236:
 		}
 break;
 case 237:
-#line 2784 "../../freebsd/sbin/pfctl/parse.y"
+#line 2784 "parse.y"
 	{ yyval.v.logquick.log = PF_LOG_ALL; yyval.v.logquick.logif = 0; }
 break;
 case 238:
-#line 2785 "../../freebsd/sbin/pfctl/parse.y"
+#line 2785 "parse.y"
 	{ yyval.v.logquick.log = PF_LOG_SOCKET_LOOKUP; yyval.v.logquick.logif = 0; }
 break;
 case 239:
-#line 2786 "../../freebsd/sbin/pfctl/parse.y"
+#line 2786 "parse.y"
 	{ yyval.v.logquick.log = PF_LOG_SOCKET_LOOKUP; yyval.v.logquick.logif = 0; }
 break;
 case 240:
-#line 2787 "../../freebsd/sbin/pfctl/parse.y"
+#line 2787 "parse.y"
 	{
 			const char	*errstr;
 			u_int		 i;
@@ -7176,23 +7176,23 @@ case 240:
 		}
 break;
 case 241:
-#line 2808 "../../freebsd/sbin/pfctl/parse.y"
+#line 2808 "parse.y"
 	{ yyval.v.interface = NULL; }
 break;
 case 242:
-#line 2809 "../../freebsd/sbin/pfctl/parse.y"
+#line 2809 "parse.y"
 	{ yyval.v.interface = yystack.l_mark[0].v.interface; }
 break;
 case 243:
-#line 2810 "../../freebsd/sbin/pfctl/parse.y"
+#line 2810 "parse.y"
 	{ yyval.v.interface = yystack.l_mark[-1].v.interface; }
 break;
 case 244:
-#line 2813 "../../freebsd/sbin/pfctl/parse.y"
+#line 2813 "parse.y"
 	{ yyval.v.interface = yystack.l_mark[-1].v.interface; }
 break;
 case 245:
-#line 2814 "../../freebsd/sbin/pfctl/parse.y"
+#line 2814 "parse.y"
 	{
 			yystack.l_mark[-3].v.interface->tail->next = yystack.l_mark[-1].v.interface;
 			yystack.l_mark[-3].v.interface->tail = yystack.l_mark[-1].v.interface;
@@ -7200,11 +7200,11 @@ case 245:
 		}
 break;
 case 246:
-#line 2821 "../../freebsd/sbin/pfctl/parse.y"
+#line 2821 "parse.y"
 	{ yyval.v.interface = yystack.l_mark[0].v.interface; yyval.v.interface->not = yystack.l_mark[-1].v.number; }
 break;
 case 247:
-#line 2824 "../../freebsd/sbin/pfctl/parse.y"
+#line 2824 "parse.y"
 	{
 			struct node_host	*n;
 
@@ -7229,35 +7229,35 @@ case 247:
 		}
 break;
 case 248:
-#line 2848 "../../freebsd/sbin/pfctl/parse.y"
+#line 2848 "parse.y"
 	{ yyval.v.i = 0; }
 break;
 case 249:
-#line 2849 "../../freebsd/sbin/pfctl/parse.y"
+#line 2849 "parse.y"
 	{ yyval.v.i = AF_INET; }
 break;
 case 250:
-#line 2850 "../../freebsd/sbin/pfctl/parse.y"
+#line 2850 "parse.y"
 	{ yyval.v.i = AF_INET6; }
 break;
 case 251:
-#line 2853 "../../freebsd/sbin/pfctl/parse.y"
+#line 2853 "parse.y"
 	{ yyval.v.proto = NULL; }
 break;
 case 252:
-#line 2854 "../../freebsd/sbin/pfctl/parse.y"
+#line 2854 "parse.y"
 	{ yyval.v.proto = yystack.l_mark[0].v.proto; }
 break;
 case 253:
-#line 2855 "../../freebsd/sbin/pfctl/parse.y"
+#line 2855 "parse.y"
 	{ yyval.v.proto = yystack.l_mark[-1].v.proto; }
 break;
 case 254:
-#line 2858 "../../freebsd/sbin/pfctl/parse.y"
+#line 2858 "parse.y"
 	{ yyval.v.proto = yystack.l_mark[-1].v.proto; }
 break;
 case 255:
-#line 2859 "../../freebsd/sbin/pfctl/parse.y"
+#line 2859 "parse.y"
 	{
 			yystack.l_mark[-3].v.proto->tail->next = yystack.l_mark[-1].v.proto;
 			yystack.l_mark[-3].v.proto->tail = yystack.l_mark[-1].v.proto;
@@ -7265,7 +7265,7 @@ case 255:
 		}
 break;
 case 256:
-#line 2866 "../../freebsd/sbin/pfctl/parse.y"
+#line 2866 "parse.y"
 	{
 			u_int8_t	pr;
 
@@ -7283,7 +7283,7 @@ case 256:
 		}
 break;
 case 257:
-#line 2883 "../../freebsd/sbin/pfctl/parse.y"
+#line 2883 "parse.y"
 	{
 			struct protoent	*p;
 
@@ -7298,7 +7298,7 @@ case 257:
 		}
 break;
 case 258:
-#line 2895 "../../freebsd/sbin/pfctl/parse.y"
+#line 2895 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
 				yyerror("protocol outside range");
@@ -7307,7 +7307,7 @@ case 258:
 		}
 break;
 case 259:
-#line 2903 "../../freebsd/sbin/pfctl/parse.y"
+#line 2903 "parse.y"
 	{
 			yyval.v.fromto.src.host = NULL;
 			yyval.v.fromto.src.port = NULL;
@@ -7317,7 +7317,7 @@ case 259:
 		}
 break;
 case 260:
-#line 2910 "../../freebsd/sbin/pfctl/parse.y"
+#line 2910 "parse.y"
 	{
 			yyval.v.fromto.src = yystack.l_mark[-2].v.peer;
 			yyval.v.fromto.src_os = yystack.l_mark[-1].v.os;
@@ -7325,19 +7325,19 @@ case 260:
 		}
 break;
 case 261:
-#line 2917 "../../freebsd/sbin/pfctl/parse.y"
+#line 2917 "parse.y"
 	{ yyval.v.os = NULL; }
 break;
 case 262:
-#line 2918 "../../freebsd/sbin/pfctl/parse.y"
+#line 2918 "parse.y"
 	{ yyval.v.os = yystack.l_mark[0].v.os; }
 break;
 case 263:
-#line 2919 "../../freebsd/sbin/pfctl/parse.y"
+#line 2919 "parse.y"
 	{ yyval.v.os = yystack.l_mark[-1].v.os; }
 break;
 case 264:
-#line 2922 "../../freebsd/sbin/pfctl/parse.y"
+#line 2922 "parse.y"
 	{
 			yyval.v.os = calloc(1, sizeof(struct node_os));
 			if (yyval.v.os == NULL)
@@ -7347,11 +7347,11 @@ case 264:
 		}
 break;
 case 265:
-#line 2931 "../../freebsd/sbin/pfctl/parse.y"
+#line 2931 "parse.y"
 	{ yyval.v.os = yystack.l_mark[-1].v.os; }
 break;
 case 266:
-#line 2932 "../../freebsd/sbin/pfctl/parse.y"
+#line 2932 "parse.y"
 	{
 			yystack.l_mark[-3].v.os->tail->next = yystack.l_mark[-1].v.os;
 			yystack.l_mark[-3].v.os->tail = yystack.l_mark[-1].v.os;
@@ -7359,27 +7359,27 @@ case 266:
 		}
 break;
 case 267:
-#line 2939 "../../freebsd/sbin/pfctl/parse.y"
+#line 2939 "parse.y"
 	{
 			yyval.v.peer.host = NULL;
 			yyval.v.peer.port = NULL;
 		}
 break;
 case 268:
-#line 2943 "../../freebsd/sbin/pfctl/parse.y"
+#line 2943 "parse.y"
 	{
 			yyval.v.peer = yystack.l_mark[0].v.peer;
 		}
 break;
 case 269:
-#line 2948 "../../freebsd/sbin/pfctl/parse.y"
+#line 2948 "parse.y"
 	{
 			yyval.v.peer.host = NULL;
 			yyval.v.peer.port = NULL;
 		}
 break;
 case 270:
-#line 2952 "../../freebsd/sbin/pfctl/parse.y"
+#line 2952 "parse.y"
 	{
 			if (disallow_urpf_failed(yystack.l_mark[0].v.peer.host, "\"urpf-failed\" is "
 			    "not permitted in a destination address"))
@@ -7388,52 +7388,52 @@ case 270:
 		}
 break;
 case 271:
-#line 2960 "../../freebsd/sbin/pfctl/parse.y"
+#line 2960 "parse.y"
 	{
 			yyval.v.peer.host = yystack.l_mark[0].v.host;
 			yyval.v.peer.port = NULL;
 		}
 break;
 case 272:
-#line 2964 "../../freebsd/sbin/pfctl/parse.y"
+#line 2964 "parse.y"
 	{
 			yyval.v.peer.host = yystack.l_mark[-2].v.host;
 			yyval.v.peer.port = yystack.l_mark[0].v.port;
 		}
 break;
 case 273:
-#line 2968 "../../freebsd/sbin/pfctl/parse.y"
+#line 2968 "parse.y"
 	{
 			yyval.v.peer.host = NULL;
 			yyval.v.peer.port = yystack.l_mark[0].v.port;
 		}
 break;
 case 276:
-#line 2978 "../../freebsd/sbin/pfctl/parse.y"
+#line 2978 "parse.y"
 	{ yyval.v.host = NULL; }
 break;
 case 277:
-#line 2979 "../../freebsd/sbin/pfctl/parse.y"
+#line 2979 "parse.y"
 	{ yyval.v.host = yystack.l_mark[0].v.host; }
 break;
 case 278:
-#line 2980 "../../freebsd/sbin/pfctl/parse.y"
+#line 2980 "parse.y"
 	{ yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 279:
-#line 2983 "../../freebsd/sbin/pfctl/parse.y"
+#line 2983 "parse.y"
 	{ yyval.v.host = yystack.l_mark[0].v.host; }
 break;
 case 280:
-#line 2984 "../../freebsd/sbin/pfctl/parse.y"
+#line 2984 "parse.y"
 	{ yyval.v.host = NULL; }
 break;
 case 281:
-#line 2987 "../../freebsd/sbin/pfctl/parse.y"
+#line 2987 "parse.y"
 	{ yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 282:
-#line 2988 "../../freebsd/sbin/pfctl/parse.y"
+#line 2988 "parse.y"
 	{
 			if (yystack.l_mark[-1].v.host == NULL)
 				yyval.v.host = yystack.l_mark[-3].v.host;
@@ -7447,7 +7447,7 @@ case 282:
 		}
 break;
 case 283:
-#line 3001 "../../freebsd/sbin/pfctl/parse.y"
+#line 3001 "parse.y"
 	{
 			struct node_host	*n;
 
@@ -7457,7 +7457,7 @@ case 283:
 		}
 break;
 case 284:
-#line 3008 "../../freebsd/sbin/pfctl/parse.y"
+#line 3008 "parse.y"
 	{
 			yyval.v.host = calloc(1, sizeof(struct node_host));
 			if (yyval.v.host == NULL)
@@ -7469,7 +7469,7 @@ case 284:
 		}
 break;
 case 285:
-#line 3017 "../../freebsd/sbin/pfctl/parse.y"
+#line 3017 "parse.y"
 	{
 			yyval.v.host = calloc(1, sizeof(struct node_host));
 			if (yyval.v.host == NULL)
@@ -7481,7 +7481,7 @@ case 285:
 		}
 break;
 case 286:
-#line 3028 "../../freebsd/sbin/pfctl/parse.y"
+#line 3028 "parse.y"
 	{
 			if ((yyval.v.host = host(yystack.l_mark[0].v.string)) == NULL)	{
 				/* error. "any" is handled elsewhere */
@@ -7494,7 +7494,7 @@ case 286:
 		}
 break;
 case 287:
-#line 3038 "../../freebsd/sbin/pfctl/parse.y"
+#line 3038 "parse.y"
 	{
 			struct node_host *b, *e;
 
@@ -7530,7 +7530,7 @@ case 287:
 		}
 break;
 case 288:
-#line 3071 "../../freebsd/sbin/pfctl/parse.y"
+#line 3071 "parse.y"
 	{
 			char	*buf;
 
@@ -7547,7 +7547,7 @@ case 288:
 		}
 break;
 case 289:
-#line 3085 "../../freebsd/sbin/pfctl/parse.y"
+#line 3085 "parse.y"
 	{
 			char	*buf;
 
@@ -7568,7 +7568,7 @@ case 289:
 		}
 break;
 case 291:
-#line 3104 "../../freebsd/sbin/pfctl/parse.y"
+#line 3104 "parse.y"
 	{
 			struct node_host	*n;
 
@@ -7582,7 +7582,7 @@ case 291:
 		}
 break;
 case 292:
-#line 3115 "../../freebsd/sbin/pfctl/parse.y"
+#line 3115 "parse.y"
 	{
 			if (strlen(yystack.l_mark[-1].v.string) >= PF_TABLE_NAME_SIZE) {
 				yyerror("table name '%s' too long", yystack.l_mark[-1].v.string);
@@ -7603,7 +7603,7 @@ case 292:
 		}
 break;
 case 294:
-#line 3136 "../../freebsd/sbin/pfctl/parse.y"
+#line 3136 "parse.y"
 	{
 			u_long	ulval;
 
@@ -7617,7 +7617,7 @@ case 294:
 		}
 break;
 case 295:
-#line 3149 "../../freebsd/sbin/pfctl/parse.y"
+#line 3149 "parse.y"
 	{
 			int	 flags = 0;
 			char	*p, *op;
@@ -7672,19 +7672,19 @@ case 295:
 		}
 break;
 case 296:
-#line 3203 "../../freebsd/sbin/pfctl/parse.y"
+#line 3203 "parse.y"
 	{ yyval.v.port = yystack.l_mark[0].v.port; }
 break;
 case 297:
-#line 3204 "../../freebsd/sbin/pfctl/parse.y"
+#line 3204 "parse.y"
 	{ yyval.v.port = yystack.l_mark[-1].v.port; }
 break;
 case 298:
-#line 3207 "../../freebsd/sbin/pfctl/parse.y"
+#line 3207 "parse.y"
 	{ yyval.v.port = yystack.l_mark[-1].v.port; }
 break;
 case 299:
-#line 3208 "../../freebsd/sbin/pfctl/parse.y"
+#line 3208 "parse.y"
 	{
 			yystack.l_mark[-3].v.port->tail->next = yystack.l_mark[-1].v.port;
 			yystack.l_mark[-3].v.port->tail = yystack.l_mark[-1].v.port;
@@ -7692,7 +7692,7 @@ case 299:
 		}
 break;
 case 300:
-#line 3215 "../../freebsd/sbin/pfctl/parse.y"
+#line 3215 "parse.y"
 	{
 			yyval.v.port = calloc(1, sizeof(struct node_port));
 			if (yyval.v.port == NULL)
@@ -7708,7 +7708,7 @@ case 300:
 		}
 break;
 case 301:
-#line 3228 "../../freebsd/sbin/pfctl/parse.y"
+#line 3228 "parse.y"
 	{
 			if (yystack.l_mark[0].v.range.t) {
 				yyerror("':' cannot be used with an other "
@@ -7726,7 +7726,7 @@ case 301:
 		}
 break;
 case 302:
-#line 3243 "../../freebsd/sbin/pfctl/parse.y"
+#line 3243 "parse.y"
 	{
 			if (yystack.l_mark[-2].v.range.t || yystack.l_mark[0].v.range.t) {
 				yyerror("':' cannot be used with an other "
@@ -7744,7 +7744,7 @@ case 302:
 		}
 break;
 case 303:
-#line 3260 "../../freebsd/sbin/pfctl/parse.y"
+#line 3260 "parse.y"
 	{
 			if (parseport(yystack.l_mark[0].v.string, &yyval.v.range, 0) == -1) {
 				free(yystack.l_mark[0].v.string);
@@ -7754,7 +7754,7 @@ case 303:
 		}
 break;
 case 304:
-#line 3269 "../../freebsd/sbin/pfctl/parse.y"
+#line 3269 "parse.y"
 	{
 			if (parseport(yystack.l_mark[0].v.string, &yyval.v.range, PPORT_RANGE) == -1) {
 				free(yystack.l_mark[0].v.string);
@@ -7764,19 +7764,19 @@ case 304:
 		}
 break;
 case 305:
-#line 3278 "../../freebsd/sbin/pfctl/parse.y"
+#line 3278 "parse.y"
 	{ yyval.v.uid = yystack.l_mark[0].v.uid; }
 break;
 case 306:
-#line 3279 "../../freebsd/sbin/pfctl/parse.y"
+#line 3279 "parse.y"
 	{ yyval.v.uid = yystack.l_mark[-1].v.uid; }
 break;
 case 307:
-#line 3282 "../../freebsd/sbin/pfctl/parse.y"
+#line 3282 "parse.y"
 	{ yyval.v.uid = yystack.l_mark[-1].v.uid; }
 break;
 case 308:
-#line 3283 "../../freebsd/sbin/pfctl/parse.y"
+#line 3283 "parse.y"
 	{
 			yystack.l_mark[-3].v.uid->tail->next = yystack.l_mark[-1].v.uid;
 			yystack.l_mark[-3].v.uid->tail = yystack.l_mark[-1].v.uid;
@@ -7784,7 +7784,7 @@ case 308:
 		}
 break;
 case 309:
-#line 3290 "../../freebsd/sbin/pfctl/parse.y"
+#line 3290 "parse.y"
 	{
 			yyval.v.uid = calloc(1, sizeof(struct node_uid));
 			if (yyval.v.uid == NULL)
@@ -7797,7 +7797,7 @@ case 309:
 		}
 break;
 case 310:
-#line 3300 "../../freebsd/sbin/pfctl/parse.y"
+#line 3300 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number == UID_MAX && yystack.l_mark[-1].v.i != PF_OP_EQ && yystack.l_mark[-1].v.i != PF_OP_NE) {
 				yyerror("user unknown requires operator = or "
@@ -7815,7 +7815,7 @@ case 310:
 		}
 break;
 case 311:
-#line 3315 "../../freebsd/sbin/pfctl/parse.y"
+#line 3315 "parse.y"
 	{
 			if (yystack.l_mark[-2].v.number == UID_MAX || yystack.l_mark[0].v.number == UID_MAX) {
 				yyerror("user unknown requires operator = or "
@@ -7833,7 +7833,7 @@ case 311:
 		}
 break;
 case 312:
-#line 3332 "../../freebsd/sbin/pfctl/parse.y"
+#line 3332 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "unknown"))
 				yyval.v.number = UID_MAX;
@@ -7851,7 +7851,7 @@ case 312:
 		}
 break;
 case 313:
-#line 3347 "../../freebsd/sbin/pfctl/parse.y"
+#line 3347 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number >= UID_MAX) {
 				yyerror("illegal uid value %lu", yystack.l_mark[0].v.number);
@@ -7861,19 +7861,19 @@ case 313:
 		}
 break;
 case 314:
-#line 3356 "../../freebsd/sbin/pfctl/parse.y"
+#line 3356 "parse.y"
 	{ yyval.v.gid = yystack.l_mark[0].v.gid; }
 break;
 case 315:
-#line 3357 "../../freebsd/sbin/pfctl/parse.y"
+#line 3357 "parse.y"
 	{ yyval.v.gid = yystack.l_mark[-1].v.gid; }
 break;
 case 316:
-#line 3360 "../../freebsd/sbin/pfctl/parse.y"
+#line 3360 "parse.y"
 	{ yyval.v.gid = yystack.l_mark[-1].v.gid; }
 break;
 case 317:
-#line 3361 "../../freebsd/sbin/pfctl/parse.y"
+#line 3361 "parse.y"
 	{
 			yystack.l_mark[-3].v.gid->tail->next = yystack.l_mark[-1].v.gid;
 			yystack.l_mark[-3].v.gid->tail = yystack.l_mark[-1].v.gid;
@@ -7881,7 +7881,7 @@ case 317:
 		}
 break;
 case 318:
-#line 3368 "../../freebsd/sbin/pfctl/parse.y"
+#line 3368 "parse.y"
 	{
 			yyval.v.gid = calloc(1, sizeof(struct node_gid));
 			if (yyval.v.gid == NULL)
@@ -7894,7 +7894,7 @@ case 318:
 		}
 break;
 case 319:
-#line 3378 "../../freebsd/sbin/pfctl/parse.y"
+#line 3378 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number == GID_MAX && yystack.l_mark[-1].v.i != PF_OP_EQ && yystack.l_mark[-1].v.i != PF_OP_NE) {
 				yyerror("group unknown requires operator = or "
@@ -7912,7 +7912,7 @@ case 319:
 		}
 break;
 case 320:
-#line 3393 "../../freebsd/sbin/pfctl/parse.y"
+#line 3393 "parse.y"
 	{
 			if (yystack.l_mark[-2].v.number == GID_MAX || yystack.l_mark[0].v.number == GID_MAX) {
 				yyerror("group unknown requires operator = or "
@@ -7930,7 +7930,7 @@ case 320:
 		}
 break;
 case 321:
-#line 3410 "../../freebsd/sbin/pfctl/parse.y"
+#line 3410 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "unknown"))
 				yyval.v.number = GID_MAX;
@@ -7948,7 +7948,7 @@ case 321:
 		}
 break;
 case 322:
-#line 3425 "../../freebsd/sbin/pfctl/parse.y"
+#line 3425 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number >= GID_MAX) {
 				yyerror("illegal gid value %lu", yystack.l_mark[0].v.number);
@@ -7958,7 +7958,7 @@ case 322:
 		}
 break;
 case 323:
-#line 3434 "../../freebsd/sbin/pfctl/parse.y"
+#line 3434 "parse.y"
 	{
 			int	f;
 
@@ -7972,39 +7972,39 @@ case 323:
 		}
 break;
 case 324:
-#line 3447 "../../freebsd/sbin/pfctl/parse.y"
+#line 3447 "parse.y"
 	{ yyval.v.b.b1 = yystack.l_mark[-2].v.b.b1; yyval.v.b.b2 = yystack.l_mark[0].v.b.b1; }
 break;
 case 325:
-#line 3448 "../../freebsd/sbin/pfctl/parse.y"
+#line 3448 "parse.y"
 	{ yyval.v.b.b1 = 0; yyval.v.b.b2 = yystack.l_mark[0].v.b.b1; }
 break;
 case 326:
-#line 3449 "../../freebsd/sbin/pfctl/parse.y"
+#line 3449 "parse.y"
 	{ yyval.v.b.b1 = 0; yyval.v.b.b2 = 0; }
 break;
 case 327:
-#line 3452 "../../freebsd/sbin/pfctl/parse.y"
+#line 3452 "parse.y"
 	{ yyval.v.icmp = yystack.l_mark[0].v.icmp; }
 break;
 case 328:
-#line 3453 "../../freebsd/sbin/pfctl/parse.y"
+#line 3453 "parse.y"
 	{ yyval.v.icmp = yystack.l_mark[-1].v.icmp; }
 break;
 case 329:
-#line 3454 "../../freebsd/sbin/pfctl/parse.y"
+#line 3454 "parse.y"
 	{ yyval.v.icmp = yystack.l_mark[0].v.icmp; }
 break;
 case 330:
-#line 3455 "../../freebsd/sbin/pfctl/parse.y"
+#line 3455 "parse.y"
 	{ yyval.v.icmp = yystack.l_mark[-1].v.icmp; }
 break;
 case 331:
-#line 3458 "../../freebsd/sbin/pfctl/parse.y"
+#line 3458 "parse.y"
 	{ yyval.v.icmp = yystack.l_mark[-1].v.icmp; }
 break;
 case 332:
-#line 3459 "../../freebsd/sbin/pfctl/parse.y"
+#line 3459 "parse.y"
 	{
 			yystack.l_mark[-3].v.icmp->tail->next = yystack.l_mark[-1].v.icmp;
 			yystack.l_mark[-3].v.icmp->tail = yystack.l_mark[-1].v.icmp;
@@ -8012,11 +8012,11 @@ case 332:
 		}
 break;
 case 333:
-#line 3466 "../../freebsd/sbin/pfctl/parse.y"
+#line 3466 "parse.y"
 	{ yyval.v.icmp = yystack.l_mark[-1].v.icmp; }
 break;
 case 334:
-#line 3467 "../../freebsd/sbin/pfctl/parse.y"
+#line 3467 "parse.y"
 	{
 			yystack.l_mark[-3].v.icmp->tail->next = yystack.l_mark[-1].v.icmp;
 			yystack.l_mark[-3].v.icmp->tail = yystack.l_mark[-1].v.icmp;
@@ -8024,7 +8024,7 @@ case 334:
 		}
 break;
 case 335:
-#line 3474 "../../freebsd/sbin/pfctl/parse.y"
+#line 3474 "parse.y"
 	{
 			yyval.v.icmp = calloc(1, sizeof(struct node_icmp));
 			if (yyval.v.icmp == NULL)
@@ -8037,7 +8037,7 @@ case 335:
 		}
 break;
 case 336:
-#line 3484 "../../freebsd/sbin/pfctl/parse.y"
+#line 3484 "parse.y"
 	{
 			const struct icmpcodeent	*p;
 
@@ -8059,7 +8059,7 @@ case 336:
 		}
 break;
 case 337:
-#line 3503 "../../freebsd/sbin/pfctl/parse.y"
+#line 3503 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
 				yyerror("illegal icmp-code %lu", yystack.l_mark[0].v.number);
@@ -8076,7 +8076,7 @@ case 337:
 		}
 break;
 case 338:
-#line 3519 "../../freebsd/sbin/pfctl/parse.y"
+#line 3519 "parse.y"
 	{
 			yyval.v.icmp = calloc(1, sizeof(struct node_icmp));
 			if (yyval.v.icmp == NULL)
@@ -8089,7 +8089,7 @@ case 338:
 		}
 break;
 case 339:
-#line 3529 "../../freebsd/sbin/pfctl/parse.y"
+#line 3529 "parse.y"
 	{
 			const struct icmpcodeent	*p;
 
@@ -8111,7 +8111,7 @@ case 339:
 		}
 break;
 case 340:
-#line 3548 "../../freebsd/sbin/pfctl/parse.y"
+#line 3548 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
 				yyerror("illegal icmp-code %lu", yystack.l_mark[0].v.number);
@@ -8128,7 +8128,7 @@ case 340:
 		}
 break;
 case 341:
-#line 3564 "../../freebsd/sbin/pfctl/parse.y"
+#line 3564 "parse.y"
 	{
 			const struct icmptypeent	*p;
 
@@ -8142,7 +8142,7 @@ case 341:
 		}
 break;
 case 342:
-#line 3575 "../../freebsd/sbin/pfctl/parse.y"
+#line 3575 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
 				yyerror("illegal icmp-type %lu", yystack.l_mark[0].v.number);
@@ -8152,7 +8152,7 @@ case 342:
 		}
 break;
 case 343:
-#line 3584 "../../freebsd/sbin/pfctl/parse.y"
+#line 3584 "parse.y"
 	{
 			const struct icmptypeent	*p;
 
@@ -8167,7 +8167,7 @@ case 343:
 		}
 break;
 case 344:
-#line 3596 "../../freebsd/sbin/pfctl/parse.y"
+#line 3596 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
 				yyerror("illegal icmp6-type %lu", yystack.l_mark[0].v.number);
@@ -8177,7 +8177,7 @@ case 344:
 		}
 break;
 case 345:
-#line 3605 "../../freebsd/sbin/pfctl/parse.y"
+#line 3605 "parse.y"
 	{
 			int val;
 			char *end;
@@ -8200,7 +8200,7 @@ case 345:
 		}
 break;
 case 346:
-#line 3625 "../../freebsd/sbin/pfctl/parse.y"
+#line 3625 "parse.y"
 	{
 			yyval.v.number = yystack.l_mark[0].v.number;
 			if (yyval.v.number < 0 || yyval.v.number > 255) {
@@ -8210,85 +8210,85 @@ case 346:
 		}
 break;
 case 347:
-#line 3634 "../../freebsd/sbin/pfctl/parse.y"
+#line 3634 "parse.y"
 	{ yyval.v.i = PF_SRCTRACK; }
 break;
 case 348:
-#line 3635 "../../freebsd/sbin/pfctl/parse.y"
+#line 3635 "parse.y"
 	{ yyval.v.i = PF_SRCTRACK_GLOBAL; }
 break;
 case 349:
-#line 3636 "../../freebsd/sbin/pfctl/parse.y"
+#line 3636 "parse.y"
 	{ yyval.v.i = PF_SRCTRACK_RULE; }
 break;
 case 350:
-#line 3639 "../../freebsd/sbin/pfctl/parse.y"
+#line 3639 "parse.y"
 	{
 			yyval.v.i = PFRULE_IFBOUND;
 		}
 break;
 case 351:
-#line 3642 "../../freebsd/sbin/pfctl/parse.y"
+#line 3642 "parse.y"
 	{
 			yyval.v.i = 0;
 		}
 break;
 case 352:
-#line 3647 "../../freebsd/sbin/pfctl/parse.y"
+#line 3647 "parse.y"
 	{
 			yyval.v.keep_state.action = 0;
 			yyval.v.keep_state.options = NULL;
 		}
 break;
 case 353:
-#line 3651 "../../freebsd/sbin/pfctl/parse.y"
+#line 3651 "parse.y"
 	{
 			yyval.v.keep_state.action = PF_STATE_NORMAL;
 			yyval.v.keep_state.options = yystack.l_mark[0].v.state_opt;
 		}
 break;
 case 354:
-#line 3655 "../../freebsd/sbin/pfctl/parse.y"
+#line 3655 "parse.y"
 	{
 			yyval.v.keep_state.action = PF_STATE_MODULATE;
 			yyval.v.keep_state.options = yystack.l_mark[0].v.state_opt;
 		}
 break;
 case 355:
-#line 3659 "../../freebsd/sbin/pfctl/parse.y"
+#line 3659 "parse.y"
 	{
 			yyval.v.keep_state.action = PF_STATE_SYNPROXY;
 			yyval.v.keep_state.options = yystack.l_mark[0].v.state_opt;
 		}
 break;
 case 356:
-#line 3665 "../../freebsd/sbin/pfctl/parse.y"
+#line 3665 "parse.y"
 	{ yyval.v.i = 0; }
 break;
 case 357:
-#line 3666 "../../freebsd/sbin/pfctl/parse.y"
+#line 3666 "parse.y"
 	{ yyval.v.i = PF_FLUSH; }
 break;
 case 358:
-#line 3667 "../../freebsd/sbin/pfctl/parse.y"
+#line 3667 "parse.y"
 	{
 			yyval.v.i = PF_FLUSH | PF_FLUSH_GLOBAL;
 		}
 break;
 case 359:
-#line 3672 "../../freebsd/sbin/pfctl/parse.y"
+#line 3672 "parse.y"
 	{ yyval.v.state_opt = yystack.l_mark[-1].v.state_opt; }
 break;
 case 360:
-#line 3673 "../../freebsd/sbin/pfctl/parse.y"
+#line 3673 "parse.y"
 	{ yyval.v.state_opt = NULL; }
 break;
 case 361:
-#line 3676 "../../freebsd/sbin/pfctl/parse.y"
+#line 3676 "parse.y"
 	{ yyval.v.state_opt = yystack.l_mark[0].v.state_opt; }
 break;
 case 362:
-#line 3677 "../../freebsd/sbin/pfctl/parse.y"
+#line 3677 "parse.y"
 	{
 			yystack.l_mark[-2].v.state_opt->tail->next = yystack.l_mark[0].v.state_opt;
 			yystack.l_mark[-2].v.state_opt->tail = yystack.l_mark[0].v.state_opt;
@@ -8296,7 +8296,7 @@ case 362:
 		}
 break;
 case 363:
-#line 3684 "../../freebsd/sbin/pfctl/parse.y"
+#line 3684 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
 				yyerror("only positive values permitted");
@@ -8312,7 +8312,7 @@ case 363:
 		}
 break;
 case 364:
-#line 3697 "../../freebsd/sbin/pfctl/parse.y"
+#line 3697 "parse.y"
 	{
 			yyval.v.state_opt = calloc(1, sizeof(struct node_state_opt));
 			if (yyval.v.state_opt == NULL)
@@ -8323,7 +8323,7 @@ case 364:
 		}
 break;
 case 365:
-#line 3705 "../../freebsd/sbin/pfctl/parse.y"
+#line 3705 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
 				yyerror("only positive values permitted");
@@ -8339,7 +8339,7 @@ case 365:
 		}
 break;
 case 366:
-#line 3718 "../../freebsd/sbin/pfctl/parse.y"
+#line 3718 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
 				yyerror("only positive values permitted");
@@ -8355,7 +8355,7 @@ case 366:
 		}
 break;
 case 367:
-#line 3731 "../../freebsd/sbin/pfctl/parse.y"
+#line 3731 "parse.y"
 	{
 			if (yystack.l_mark[-2].v.number < 0 || yystack.l_mark[-2].v.number > UINT_MAX ||
 			    yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
@@ -8373,7 +8373,7 @@ case 367:
 		}
 break;
 case 368:
-#line 3746 "../../freebsd/sbin/pfctl/parse.y"
+#line 3746 "parse.y"
 	{
 			if (strlen(yystack.l_mark[-2].v.string) >= PF_TABLE_NAME_SIZE) {
 				yyerror("table name '%s' too long", yystack.l_mark[-2].v.string);
@@ -8394,7 +8394,7 @@ case 368:
 		}
 break;
 case 369:
-#line 3764 "../../freebsd/sbin/pfctl/parse.y"
+#line 3764 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
 				yyerror("only positive values permitted");
@@ -8410,7 +8410,7 @@ case 369:
 		}
 break;
 case 370:
-#line 3777 "../../freebsd/sbin/pfctl/parse.y"
+#line 3777 "parse.y"
 	{
 			yyval.v.state_opt = calloc(1, sizeof(struct node_state_opt));
 			if (yyval.v.state_opt == NULL)
@@ -8422,7 +8422,7 @@ case 370:
 		}
 break;
 case 371:
-#line 3786 "../../freebsd/sbin/pfctl/parse.y"
+#line 3786 "parse.y"
 	{
 			yyval.v.state_opt = calloc(1, sizeof(struct node_state_opt));
 			if (yyval.v.state_opt == NULL)
@@ -8434,7 +8434,7 @@ case 371:
 		}
 break;
 case 372:
-#line 3795 "../../freebsd/sbin/pfctl/parse.y"
+#line 3795 "parse.y"
 	{
 			yyval.v.state_opt = calloc(1, sizeof(struct node_state_opt));
 			if (yyval.v.state_opt == NULL)
@@ -8445,7 +8445,7 @@ case 372:
 		}
 break;
 case 373:
-#line 3803 "../../freebsd/sbin/pfctl/parse.y"
+#line 3803 "parse.y"
 	{
 			int	i;
 
@@ -8478,42 +8478,42 @@ case 373:
 		}
 break;
 case 374:
-#line 3835 "../../freebsd/sbin/pfctl/parse.y"
+#line 3835 "parse.y"
 	{
 			yyval.v.string = yystack.l_mark[0].v.string;
 		}
 break;
 case 375:
-#line 3840 "../../freebsd/sbin/pfctl/parse.y"
+#line 3840 "parse.y"
 	{
 			yyval.v.qassign.qname = yystack.l_mark[0].v.string;
 			yyval.v.qassign.pqname = NULL;
 		}
 break;
 case 376:
-#line 3844 "../../freebsd/sbin/pfctl/parse.y"
+#line 3844 "parse.y"
 	{
 			yyval.v.qassign.qname = yystack.l_mark[-1].v.string;
 			yyval.v.qassign.pqname = NULL;
 		}
 break;
 case 377:
-#line 3848 "../../freebsd/sbin/pfctl/parse.y"
+#line 3848 "parse.y"
 	{
 			yyval.v.qassign.qname = yystack.l_mark[-3].v.string;
 			yyval.v.qassign.pqname = yystack.l_mark[-1].v.string;
 		}
 break;
 case 378:
-#line 3854 "../../freebsd/sbin/pfctl/parse.y"
+#line 3854 "parse.y"
 	{ yyval.v.i = 0; }
 break;
 case 379:
-#line 3855 "../../freebsd/sbin/pfctl/parse.y"
+#line 3855 "parse.y"
 	{ yyval.v.i = 1; }
 break;
 case 380:
-#line 3858 "../../freebsd/sbin/pfctl/parse.y"
+#line 3858 "parse.y"
 	{
 			if (parseport(yystack.l_mark[0].v.string, &yyval.v.range, PPORT_RANGE|PPORT_STAR) == -1) {
 				free(yystack.l_mark[0].v.string);
@@ -8523,19 +8523,19 @@ case 380:
 		}
 break;
 case 381:
-#line 3867 "../../freebsd/sbin/pfctl/parse.y"
+#line 3867 "parse.y"
 	{ yyval.v.host = yystack.l_mark[0].v.host; }
 break;
 case 382:
-#line 3868 "../../freebsd/sbin/pfctl/parse.y"
+#line 3868 "parse.y"
 	{ yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 383:
-#line 3871 "../../freebsd/sbin/pfctl/parse.y"
+#line 3871 "parse.y"
 	{ yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 384:
-#line 3872 "../../freebsd/sbin/pfctl/parse.y"
+#line 3872 "parse.y"
 	{
 			yystack.l_mark[-3].v.host->tail->next = yystack.l_mark[-1].v.host;
 			yystack.l_mark[-3].v.host->tail = yystack.l_mark[-1].v.host->tail;
@@ -8543,11 +8543,11 @@ case 384:
 		}
 break;
 case 385:
-#line 3879 "../../freebsd/sbin/pfctl/parse.y"
+#line 3879 "parse.y"
 	{ yyval.v.redirection = NULL; }
 break;
 case 386:
-#line 3880 "../../freebsd/sbin/pfctl/parse.y"
+#line 3880 "parse.y"
 	{
 			yyval.v.redirection = calloc(1, sizeof(struct redirection));
 			if (yyval.v.redirection == NULL)
@@ -8557,7 +8557,7 @@ case 386:
 		}
 break;
 case 387:
-#line 3887 "../../freebsd/sbin/pfctl/parse.y"
+#line 3887 "parse.y"
 	{
 			yyval.v.redirection = calloc(1, sizeof(struct redirection));
 			if (yyval.v.redirection == NULL)
@@ -8567,7 +8567,7 @@ case 387:
 		}
 break;
 case 388:
-#line 3897 "../../freebsd/sbin/pfctl/parse.y"
+#line 3897 "parse.y"
 	{
 			yyval.v.hashkey = calloc(1, sizeof(struct pf_poolhashkey));
 			if (yyval.v.hashkey == NULL)
@@ -8579,7 +8579,7 @@ case 388:
 		}
 break;
 case 389:
-#line 3907 "../../freebsd/sbin/pfctl/parse.y"
+#line 3907 "parse.y"
 	{
 			if (!strncmp(yystack.l_mark[0].v.string, "0x", 2)) {
 				if (strlen(yystack.l_mark[0].v.string) != 34) {
@@ -8619,22 +8619,22 @@ case 389:
 		}
 break;
 case 390:
-#line 3946 "../../freebsd/sbin/pfctl/parse.y"
+#line 3946 "parse.y"
 	{ bzero(&pool_opts, sizeof pool_opts); }
 break;
 case 391:
-#line 3948 "../../freebsd/sbin/pfctl/parse.y"
+#line 3948 "parse.y"
 	{ yyval.v.pool_opts = pool_opts; }
 break;
 case 392:
-#line 3949 "../../freebsd/sbin/pfctl/parse.y"
+#line 3949 "parse.y"
 	{
 			bzero(&pool_opts, sizeof pool_opts);
 			yyval.v.pool_opts = pool_opts;
 		}
 break;
 case 395:
-#line 3959 "../../freebsd/sbin/pfctl/parse.y"
+#line 3959 "parse.y"
 	{
 			if (pool_opts.type) {
 				yyerror("pool type cannot be redefined");
@@ -8644,7 +8644,7 @@ case 395:
 		}
 break;
 case 396:
-#line 3966 "../../freebsd/sbin/pfctl/parse.y"
+#line 3966 "parse.y"
 	{
 			if (pool_opts.type) {
 				yyerror("pool type cannot be redefined");
@@ -8654,7 +8654,7 @@ case 396:
 		}
 break;
 case 397:
-#line 3973 "../../freebsd/sbin/pfctl/parse.y"
+#line 3973 "parse.y"
 	{
 			if (pool_opts.type) {
 				yyerror("pool type cannot be redefined");
@@ -8665,7 +8665,7 @@ case 397:
 		}
 break;
 case 398:
-#line 3981 "../../freebsd/sbin/pfctl/parse.y"
+#line 3981 "parse.y"
 	{
 			if (pool_opts.type) {
 				yyerror("pool type cannot be redefined");
@@ -8675,7 +8675,7 @@ case 398:
 		}
 break;
 case 399:
-#line 3988 "../../freebsd/sbin/pfctl/parse.y"
+#line 3988 "parse.y"
 	{
 			if (pool_opts.staticport) {
 				yyerror("static-port cannot be redefined");
@@ -8685,7 +8685,7 @@ case 399:
 		}
 break;
 case 400:
-#line 3995 "../../freebsd/sbin/pfctl/parse.y"
+#line 3995 "parse.y"
 	{
 			if (filter_opts.marker & POM_STICKYADDRESS) {
 				yyerror("sticky-address cannot be redefined");
@@ -8696,11 +8696,11 @@ case 400:
 		}
 break;
 case 401:
-#line 4005 "../../freebsd/sbin/pfctl/parse.y"
+#line 4005 "parse.y"
 	{ yyval.v.redirection = NULL; }
 break;
 case 402:
-#line 4006 "../../freebsd/sbin/pfctl/parse.y"
+#line 4006 "parse.y"
 	{
 			yyval.v.redirection = calloc(1, sizeof(struct redirection));
 			if (yyval.v.redirection == NULL)
@@ -8710,7 +8710,7 @@ case 402:
 		}
 break;
 case 403:
-#line 4013 "../../freebsd/sbin/pfctl/parse.y"
+#line 4013 "parse.y"
 	{
 			yyval.v.redirection = calloc(1, sizeof(struct redirection));
 			if (yyval.v.redirection == NULL)
@@ -8720,23 +8720,23 @@ case 403:
 		}
 break;
 case 404:
-#line 4022 "../../freebsd/sbin/pfctl/parse.y"
+#line 4022 "parse.y"
 	{ yyval.v.b.b1 = yyval.v.b.b2 = 0; yyval.v.b.w2 = 0; }
 break;
 case 405:
-#line 4023 "../../freebsd/sbin/pfctl/parse.y"
+#line 4023 "parse.y"
 	{ yyval.v.b.b1 = 1; yyval.v.b.b2 = 0; yyval.v.b.w2 = 0; }
 break;
 case 406:
-#line 4024 "../../freebsd/sbin/pfctl/parse.y"
+#line 4024 "parse.y"
 	{ yyval.v.b.b1 = 1; yyval.v.b.b2 = yystack.l_mark[0].v.logquick.log; yyval.v.b.w2 = yystack.l_mark[0].v.logquick.logif; }
 break;
 case 407:
-#line 4025 "../../freebsd/sbin/pfctl/parse.y"
+#line 4025 "parse.y"
 	{ yyval.v.b.b1 = 0; yyval.v.b.b2 = yystack.l_mark[0].v.logquick.log; yyval.v.b.w2 = yystack.l_mark[0].v.logquick.logif; }
 break;
 case 408:
-#line 4028 "../../freebsd/sbin/pfctl/parse.y"
+#line 4028 "parse.y"
 	{
 			if (yystack.l_mark[-2].v.i && yystack.l_mark[0].v.b.b1) {
 				yyerror("\"pass\" not valid with \"no\"");
@@ -8752,7 +8752,7 @@ case 408:
 		}
 break;
 case 409:
-#line 4041 "../../freebsd/sbin/pfctl/parse.y"
+#line 4041 "parse.y"
 	{
 			if (yystack.l_mark[-2].v.i && yystack.l_mark[0].v.b.b1) {
 				yyerror("\"pass\" not valid with \"no\"");
@@ -8768,7 +8768,7 @@ case 409:
 		}
 break;
 case 410:
-#line 4058 "../../freebsd/sbin/pfctl/parse.y"
+#line 4058 "parse.y"
 	{
 			struct pf_rule	r;
 
@@ -8926,7 +8926,7 @@ case 410:
 		}
 break;
 case 411:
-#line 4217 "../../freebsd/sbin/pfctl/parse.y"
+#line 4217 "parse.y"
 	{
 			struct pf_rule		binat;
 			struct pf_pooladdr	*pa;
@@ -9092,27 +9092,27 @@ case 411:
 		}
 break;
 case 412:
-#line 4382 "../../freebsd/sbin/pfctl/parse.y"
+#line 4382 "parse.y"
 	{ yyval.v.string = NULL; }
 break;
 case 413:
-#line 4383 "../../freebsd/sbin/pfctl/parse.y"
+#line 4383 "parse.y"
 	{ yyval.v.string = yystack.l_mark[0].v.string; }
 break;
 case 414:
-#line 4386 "../../freebsd/sbin/pfctl/parse.y"
+#line 4386 "parse.y"
 	{ yyval.v.tagged.neg = 0; yyval.v.tagged.name = NULL; }
 break;
 case 415:
-#line 4387 "../../freebsd/sbin/pfctl/parse.y"
+#line 4387 "parse.y"
 	{ yyval.v.tagged.neg = yystack.l_mark[-2].v.number; yyval.v.tagged.name = yystack.l_mark[0].v.string; }
 break;
 case 416:
-#line 4390 "../../freebsd/sbin/pfctl/parse.y"
+#line 4390 "parse.y"
 	{ yyval.v.rtableid = -1; }
 break;
 case 417:
-#line 4391 "../../freebsd/sbin/pfctl/parse.y"
+#line 4391 "parse.y"
 	{
 			if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > rt_tableid_max()) {
 				yyerror("invalid rtable id");
@@ -9122,7 +9122,7 @@ case 417:
 		}
 break;
 case 418:
-#line 4400 "../../freebsd/sbin/pfctl/parse.y"
+#line 4400 "parse.y"
 	{
 			yyval.v.host = calloc(1, sizeof(struct node_host));
 			if (yyval.v.host == NULL)
@@ -9134,18 +9134,18 @@ case 418:
 		}
 break;
 case 419:
-#line 4409 "../../freebsd/sbin/pfctl/parse.y"
+#line 4409 "parse.y"
 	{
 			yyval.v.host = yystack.l_mark[-1].v.host;
 			yyval.v.host->ifname = yystack.l_mark[-2].v.string;
 		}
 break;
 case 420:
-#line 4415 "../../freebsd/sbin/pfctl/parse.y"
+#line 4415 "parse.y"
 	{ yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 421:
-#line 4416 "../../freebsd/sbin/pfctl/parse.y"
+#line 4416 "parse.y"
 	{
 			if (yystack.l_mark[-3].v.host->af == 0)
 				yystack.l_mark[-3].v.host->af = yystack.l_mark[-1].v.host->af;
@@ -9160,15 +9160,15 @@ case 421:
 		}
 break;
 case 422:
-#line 4430 "../../freebsd/sbin/pfctl/parse.y"
+#line 4430 "parse.y"
 	{ yyval.v.host = yystack.l_mark[0].v.host; }
 break;
 case 423:
-#line 4431 "../../freebsd/sbin/pfctl/parse.y"
+#line 4431 "parse.y"
 	{ yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 424:
-#line 4434 "../../freebsd/sbin/pfctl/parse.y"
+#line 4434 "parse.y"
 	{
 			yyval.v.route.host = NULL;
 			yyval.v.route.rt = 0;
@@ -9176,7 +9176,7 @@ case 424:
 		}
 break;
 case 425:
-#line 4439 "../../freebsd/sbin/pfctl/parse.y"
+#line 4439 "parse.y"
 	{
 			/* backwards-compat */
 			yyval.v.route.host = NULL;
@@ -9185,7 +9185,7 @@ case 425:
 		}
 break;
 case 426:
-#line 4445 "../../freebsd/sbin/pfctl/parse.y"
+#line 4445 "parse.y"
 	{
 			yyval.v.route.host = yystack.l_mark[-1].v.host;
 			yyval.v.route.rt = PF_ROUTETO;
@@ -9195,7 +9195,7 @@ case 426:
 		}
 break;
 case 427:
-#line 4452 "../../freebsd/sbin/pfctl/parse.y"
+#line 4452 "parse.y"
 	{
 			yyval.v.route.host = yystack.l_mark[-1].v.host;
 			yyval.v.route.rt = PF_REPLYTO;
@@ -9205,7 +9205,7 @@ case 427:
 		}
 break;
 case 428:
-#line 4459 "../../freebsd/sbin/pfctl/parse.y"
+#line 4459 "parse.y"
 	{
 			yyval.v.route.host = yystack.l_mark[-1].v.host;
 			yyval.v.route.rt = PF_DUPTO;
@@ -9215,7 +9215,7 @@ case 428:
 		}
 break;
 case 429:
-#line 4469 "../../freebsd/sbin/pfctl/parse.y"
+#line 4469 "parse.y"
 	{
 			if (check_rulestate(PFCTL_STATE_OPTION)) {
 				free(yystack.l_mark[-1].v.string);
@@ -9234,7 +9234,7 @@ case 429:
 		}
 break;
 case 430:
-#line 4485 "../../freebsd/sbin/pfctl/parse.y"
+#line 4485 "parse.y"
 	{
 			if (check_rulestate(PFCTL_STATE_OPTION))
 				YYERROR;
@@ -9247,7 +9247,7 @@ case 430:
 		}
 break;
 case 433:
-#line 4502 "../../freebsd/sbin/pfctl/parse.y"
+#line 4502 "parse.y"
 	{
 			if (check_rulestate(PFCTL_STATE_OPTION)) {
 				free(yystack.l_mark[-1].v.string);
@@ -9266,11 +9266,11 @@ case 433:
 		}
 break;
 case 438:
-#line 4528 "../../freebsd/sbin/pfctl/parse.y"
+#line 4528 "parse.y"
 	{ yyval.v.number = 0; }
 break;
 case 439:
-#line 4529 "../../freebsd/sbin/pfctl/parse.y"
+#line 4529 "parse.y"
 	{
 			if (!strcmp(yystack.l_mark[0].v.string, "yes"))
 				yyval.v.number = 1;
@@ -9284,30 +9284,30 @@ case 439:
 		}
 break;
 case 440:
-#line 4542 "../../freebsd/sbin/pfctl/parse.y"
+#line 4542 "parse.y"
 	{ yyval.v.i = PF_OP_EQ; }
 break;
 case 441:
-#line 4543 "../../freebsd/sbin/pfctl/parse.y"
+#line 4543 "parse.y"
 	{ yyval.v.i = PF_OP_NE; }
 break;
 case 442:
-#line 4544 "../../freebsd/sbin/pfctl/parse.y"
+#line 4544 "parse.y"
 	{ yyval.v.i = PF_OP_LE; }
 break;
 case 443:
-#line 4545 "../../freebsd/sbin/pfctl/parse.y"
+#line 4545 "parse.y"
 	{ yyval.v.i = PF_OP_LT; }
 break;
 case 444:
-#line 4546 "../../freebsd/sbin/pfctl/parse.y"
+#line 4546 "parse.y"
 	{ yyval.v.i = PF_OP_GE; }
 break;
 case 445:
-#line 4547 "../../freebsd/sbin/pfctl/parse.y"
+#line 4547 "parse.y"
 	{ yyval.v.i = PF_OP_GT; }
 break;
-#line 9311 "pfctly.tab.c"
+#line 9311 "parse.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/freebsd/sbin/pfctl/parse.h b/freebsd/sbin/pfctl/parse.h
index 929f995..1504815 100644
--- a/freebsd/sbin/pfctl/parse.h
+++ b/freebsd/sbin/pfctl/parse.h
@@ -1,337 +1,130 @@
-/* A Bison parser, made by GNU Bison 2.7.  */
-
-/* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-#ifndef YY_PFCTLY_PFCTLY_TAB_H_INCLUDED
-# define YY_PFCTLY_PFCTLY_TAB_H_INCLUDED
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int pfctlydebug;
-#endif
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     PASS = 258,
-     BLOCK = 259,
-     SCRUB = 260,
-     RETURN = 261,
-     IN = 262,
-     OS = 263,
-     OUT = 264,
-     LOG = 265,
-     QUICK = 266,
-     ON = 267,
-     FROM = 268,
-     TO = 269,
-     FLAGS = 270,
-     RETURNRST = 271,
-     RETURNICMP = 272,
-     RETURNICMP6 = 273,
-     PROTO = 274,
-     INET = 275,
-     INET6 = 276,
-     ALL = 277,
-     ANY = 278,
-     ICMPTYPE = 279,
-     ICMP6TYPE = 280,
-     CODE = 281,
-     KEEP = 282,
-     MODULATE = 283,
-     STATE = 284,
-     PORT = 285,
-     RDR = 286,
-     NAT = 287,
-     BINAT = 288,
-     ARROW = 289,
-     NODF = 290,
-     MINTTL = 291,
-     ERROR = 292,
-     ALLOWOPTS = 293,
-     FASTROUTE = 294,
-     FILENAME = 295,
-     ROUTETO = 296,
-     DUPTO = 297,
-     REPLYTO = 298,
-     NO = 299,
-     LABEL = 300,
-     NOROUTE = 301,
-     URPFFAILED = 302,
-     FRAGMENT = 303,
-     USER = 304,
-     GROUP = 305,
-     MAXMSS = 306,
-     MAXIMUM = 307,
-     TTL = 308,
-     TOS = 309,
-     DROP = 310,
-     TABLE = 311,
-     REASSEMBLE = 312,
-     FRAGDROP = 313,
-     FRAGCROP = 314,
-     ANCHOR = 315,
-     NATANCHOR = 316,
-     RDRANCHOR = 317,
-     BINATANCHOR = 318,
-     SET = 319,
-     OPTIMIZATION = 320,
-     TIMEOUT = 321,
-     LIMIT = 322,
-     LOGINTERFACE = 323,
-     BLOCKPOLICY = 324,
-     RANDOMID = 325,
-     REQUIREORDER = 326,
-     SYNPROXY = 327,
-     FINGERPRINTS = 328,
-     NOSYNC = 329,
-     DEBUG = 330,
-     SKIP = 331,
-     HOSTID = 332,
-     ANTISPOOF = 333,
-     FOR = 334,
-     INCLUDE = 335,
-     BITMASK = 336,
-     RANDOM = 337,
-     SOURCEHASH = 338,
-     ROUNDROBIN = 339,
-     STATICPORT = 340,
-     PROBABILITY = 341,
-     ALTQ = 342,
-     CBQ = 343,
-     CODEL = 344,
-     PRIQ = 345,
-     HFSC = 346,
-     FAIRQ = 347,
-     BANDWIDTH = 348,
-     TBRSIZE = 349,
-     LINKSHARE = 350,
-     REALTIME = 351,
-     UPPERLIMIT = 352,
-     QUEUE = 353,
-     PRIORITY = 354,
-     QLIMIT = 355,
-     HOGS = 356,
-     BUCKETS = 357,
-     RTABLE = 358,
-     TARGET = 359,
-     INTERVAL = 360,
-     LOAD = 361,
-     RULESET_OPTIMIZATION = 362,
-     PRIO = 363,
-     STICKYADDRESS = 364,
-     MAXSRCSTATES = 365,
-     MAXSRCNODES = 366,
-     SOURCETRACK = 367,
-     GLOBAL = 368,
-     RULE = 369,
-     MAXSRCCONN = 370,
-     MAXSRCCONNRATE = 371,
-     OVERLOAD = 372,
-     FLUSH = 373,
-     SLOPPY = 374,
-     TAGGED = 375,
-     TAG = 376,
-     IFBOUND = 377,
-     FLOATING = 378,
-     STATEPOLICY = 379,
-     STATEDEFAULTS = 380,
-     ROUTE = 381,
-     SETTOS = 382,
-     DIVERTTO = 383,
-     DIVERTREPLY = 384,
-     STRING = 385,
-     NUMBER = 386,
-     PORTBINARY = 387
-   };
-#endif
-/* Tokens.  */
-#define PASS 258
-#define BLOCK 259
-#define SCRUB 260
-#define RETURN 261
-#define IN 262
-#define OS 263
-#define OUT 264
-#define LOG 265
-#define QUICK 266
-#define ON 267
-#define FROM 268
-#define TO 269
-#define FLAGS 270
-#define RETURNRST 271
-#define RETURNICMP 272
-#define RETURNICMP6 273
-#define PROTO 274
-#define INET 275
-#define INET6 276
-#define ALL 277
-#define ANY 278
-#define ICMPTYPE 279
-#define ICMP6TYPE 280
-#define CODE 281
-#define KEEP 282
-#define MODULATE 283
-#define STATE 284
-#define PORT 285
-#define RDR 286
-#define NAT 287
-#define BINAT 288
-#define ARROW 289
-#define NODF 290
-#define MINTTL 291
-#define ERROR 292
-#define ALLOWOPTS 293
-#define FASTROUTE 294
-#define FILENAME 295
-#define ROUTETO 296
-#define DUPTO 297
-#define REPLYTO 298
-#define NO 299
-#define LABEL 300
-#define NOROUTE 301
-#define URPFFAILED 302
-#define FRAGMENT 303
-#define USER 304
-#define GROUP 305
-#define MAXMSS 306
-#define MAXIMUM 307
-#define TTL 308
-#define TOS 309
-#define DROP 310
-#define TABLE 311
-#define REASSEMBLE 312
-#define FRAGDROP 313
-#define FRAGCROP 314
-#define ANCHOR 315
-#define NATANCHOR 316
-#define RDRANCHOR 317
-#define BINATANCHOR 318
-#define SET 319
-#define OPTIMIZATION 320
-#define TIMEOUT 321
-#define LIMIT 322
-#define LOGINTERFACE 323
-#define BLOCKPOLICY 324
-#define RANDOMID 325
-#define REQUIREORDER 326
-#define SYNPROXY 327
-#define FINGERPRINTS 328
-#define NOSYNC 329
-#define DEBUG 330
-#define SKIP 331
-#define HOSTID 332
-#define ANTISPOOF 333
-#define FOR 334
-#define INCLUDE 335
-#define BITMASK 336
-#define RANDOM 337
-#define SOURCEHASH 338
-#define ROUNDROBIN 339
-#define STATICPORT 340
-#define PROBABILITY 341
-#define ALTQ 342
-#define CBQ 343
-#define CODEL 344
-#define PRIQ 345
-#define HFSC 346
-#define FAIRQ 347
-#define BANDWIDTH 348
-#define TBRSIZE 349
-#define LINKSHARE 350
-#define REALTIME 351
-#define UPPERLIMIT 352
-#define QUEUE 353
-#define PRIORITY 354
-#define QLIMIT 355
-#define HOGS 356
-#define BUCKETS 357
-#define RTABLE 358
-#define TARGET 359
-#define INTERVAL 360
-#define LOAD 361
-#define RULESET_OPTIMIZATION 362
-#define PRIO 363
-#define STICKYADDRESS 364
-#define MAXSRCSTATES 365
-#define MAXSRCNODES 366
-#define SOURCETRACK 367
-#define GLOBAL 368
-#define RULE 369
-#define MAXSRCCONN 370
-#define MAXSRCCONNRATE 371
-#define OVERLOAD 372
-#define FLUSH 373
-#define SLOPPY 374
-#define TAGGED 375
-#define TAG 376
-#define IFBOUND 377
-#define FLOATING 378
-#define STATEPOLICY 379
-#define STATEDEFAULTS 380
-#define ROUTE 381
-#define SETTOS 382
-#define DIVERTTO 383
-#define DIVERTREPLY 384
-#define STRING 385
-#define NUMBER 386
-#define PORTBINARY 387
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-extern YYSTYPE pfctlylval;
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int pfctlyparse (void *YYPARSE_PARAM);
-#else
-int pfctlyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int pfctlyparse (void);
-#else
-int pfctlyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-#endif /* !YY_PFCTLY_PFCTLY_TAB_H_INCLUDED  */
+#define PASS 257
+#define BLOCK 258
+#define SCRUB 259
+#define RETURN 260
+#define IN 261
+#define OS 262
+#define OUT 263
+#define LOG 264
+#define QUICK 265
+#define ON 266
+#define FROM 267
+#define TO 268
+#define FLAGS 269
+#define RETURNRST 270
+#define RETURNICMP 271
+#define RETURNICMP6 272
+#define PROTO 273
+#define INET 274
+#define INET6 275
+#define ALL 276
+#define ANY 277
+#define ICMPTYPE 278
+#define ICMP6TYPE 279
+#define CODE 280
+#define KEEP 281
+#define MODULATE 282
+#define STATE 283
+#define PORT 284
+#define RDR 285
+#define NAT 286
+#define BINAT 287
+#define ARROW 288
+#define NODF 289
+#define MINTTL 290
+#define ERROR 291
+#define ALLOWOPTS 292
+#define FASTROUTE 293
+#define FILENAME 294
+#define ROUTETO 295
+#define DUPTO 296
+#define REPLYTO 297
+#define NO 298
+#define LABEL 299
+#define NOROUTE 300
+#define URPFFAILED 301
+#define FRAGMENT 302
+#define USER 303
+#define GROUP 304
+#define MAXMSS 305
+#define MAXIMUM 306
+#define TTL 307
+#define TOS 308
+#define DROP 309
+#define TABLE 310
+#define REASSEMBLE 311
+#define FRAGDROP 312
+#define FRAGCROP 313
+#define ANCHOR 314
+#define NATANCHOR 315
+#define RDRANCHOR 316
+#define BINATANCHOR 317
+#define SET 318
+#define OPTIMIZATION 319
+#define TIMEOUT 320
+#define LIMIT 321
+#define LOGINTERFACE 322
+#define BLOCKPOLICY 323
+#define RANDOMID 324
+#define REQUIREORDER 325
+#define SYNPROXY 326
+#define FINGERPRINTS 327
+#define NOSYNC 328
+#define DEBUG 329
+#define SKIP 330
+#define HOSTID 331
+#define ANTISPOOF 332
+#define FOR 333
+#define INCLUDE 334
+#define BITMASK 335
+#define RANDOM 336
+#define SOURCEHASH 337
+#define ROUNDROBIN 338
+#define STATICPORT 339
+#define PROBABILITY 340
+#define ALTQ 341
+#define CBQ 342
+#define CODEL 343
+#define PRIQ 344
+#define HFSC 345
+#define FAIRQ 346
+#define BANDWIDTH 347
+#define TBRSIZE 348
+#define LINKSHARE 349
+#define REALTIME 350
+#define UPPERLIMIT 351
+#define QUEUE 352
+#define PRIORITY 353
+#define QLIMIT 354
+#define HOGS 355
+#define BUCKETS 356
+#define RTABLE 357
+#define TARGET 358
+#define INTERVAL 359
+#define LOAD 360
+#define RULESET_OPTIMIZATION 361
+#define PRIO 362
+#define STICKYADDRESS 363
+#define MAXSRCSTATES 364
+#define MAXSRCNODES 365
+#define SOURCETRACK 366
+#define GLOBAL 367
+#define RULE 368
+#define MAXSRCCONN 369
+#define MAXSRCCONNRATE 370
+#define OVERLOAD 371
+#define FLUSH 372
+#define SLOPPY 373
+#define TAGGED 374
+#define TAG 375
+#define IFBOUND 376
+#define FLOATING 377
+#define STATEPOLICY 378
+#define STATEDEFAULTS 379
+#define ROUTE 380
+#define SETTOS 381
+#define DIVERTTO 382
+#define DIVERTREPLY 383
+#define STRING 384
+#define NUMBER 385
+#define PORTBINARY 386




More information about the vc mailing list