From 2f1882b24f1486dabe638cffefb4b6c246629097 Mon Sep 17 00:00:00 2001
From: "nethack.rankin" <nethack.rankin>
Date: Thu, 8 May 2008 02:18:55 +0000
Subject: [PATCH] lex sync (trunk only)

     Propagate recent util/*_comp.l changes to sys/share/*_lex.c.
---
 sys/share/dgn_lex.c |  6 +++---
 sys/share/lev_lex.c | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/share/dgn_lex.c b/sys/share/dgn_lex.c
index a39fadc32..6daab1913 100644
--- a/sys/share/dgn_lex.c
+++ b/sys/share/dgn_lex.c
@@ -480,7 +480,7 @@ void FDECL(init_yyout, (FILE *));
 
 extern YYSTYPE yylval;
 
-int line_number = 1;
+int nh_line_number = 1;
 
 
 /* Macros after this point can all be overridden by user definitions in
@@ -791,11 +791,11 @@ YY_RULE_SETUP
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-{ line_number++; }
+{ nh_line_number++; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-{ line_number++; }
+{ nh_line_number++; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
diff --git a/sys/share/lev_lex.c b/sys/share/lev_lex.c
index 668390d62..deb7e6eef 100644
--- a/sys/share/lev_lex.c
+++ b/sys/share/lev_lex.c
@@ -758,7 +758,7 @@ void FDECL(init_yyout, (FILE *));
  */
 extern YYSTYPE yylval;
 
-int line_number = 1, colon_line_number = 1;
+int nh_line_number = 1, colon_line_number = 1;
 static char map[4096];
 static int map_cnt = 0;
 
@@ -965,7 +965,7 @@ YY_RULE_SETUP
 		  int len = yyleng;
 		  /* convert \r\n to \n */
 		  if (len >= 2 && yytext[len - 2] == '\r') len -= 1;
-		  line_number++;
+		  nh_line_number++;
 		  (void) strncpy(map + map_cnt, yytext, len);
 		  map_cnt += len;
 		  map[map_cnt - 1] = '\n';
@@ -974,11 +974,11 @@ YY_RULE_SETUP
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-{ line_number++; }
+{ nh_line_number++; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-{ colon_line_number = line_number; return ':'; }
+{ colon_line_number = nh_line_number; return ':'; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
@@ -1010,7 +1010,7 @@ return GEOMETRY_ID;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-{ BEGIN(MAPC); line_number++; }
+{ BEGIN(MAPC); nh_line_number++; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
@@ -1397,7 +1397,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-{ line_number++; }
+{ nh_line_number++; }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP