From 66e95588e2ca7cfcdf987808ce6f71f10dfefd0b Mon Sep 17 00:00:00 2001
From: nuffer <nuffer@642ea486-5414-0410-9d7f-a0204ed87703>
Date: Fri, 2 Jan 2004 15:07:12 +0000
Subject: [PATCH] Incorporated patches from FreeBSD ports.

---
 scanner.cc | 10 +++++-----
 scanner.h  |  4 ++--
 scanner.re | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scanner.cc b/scanner.cc
index 19b42597..53fcb08d 100644
--- a/scanner.cc
+++ b/scanner.cc
@@ -12,7 +12,7 @@ extern YYSTYPE yylval;
 
 #define	BSIZE	8192
 
-#define	YYCTYPE		uchar
+#define	YYCTYPE		char
 #define	YYCURSOR	cursor
 #define	YYLIMIT		lim
 #define	YYMARKER	ptr
@@ -27,7 +27,7 @@ Scanner::Scanner(int i) : in(i),
     ;
 }
 
-uchar *Scanner::fill(uchar *cursor){
+char *Scanner::fill(char *cursor){
     if(!eof){
 	uint cnt = tok - bot;
 	if(cnt){
@@ -39,7 +39,7 @@ uchar *Scanner::fill(uchar *cursor){
 	    lim -= cnt;
 	}
 	if((top - lim) < BSIZE){
-	    uchar *buf = new uchar[(lim - bot) + BSIZE];
+	    char *buf = new char[(lim - bot) + BSIZE];
 	    memcpy(buf, tok, lim - tok);
 	    tok = buf;
 	    ptr = &buf[ptr - bot];
@@ -62,7 +62,7 @@ uchar *Scanner::fill(uchar *cursor){
 
 
 int Scanner::echo(ostream &out){
-    uchar *cursor = cur;
+    char *cursor = cur;
     tok = cursor;
 echo:
 {
@@ -117,7 +117,7 @@ yy14:
 
 
 int Scanner::scan(){
-    uchar *cursor = cur;
+    char *cursor = cur;
     uint depth;
 
 scan:
diff --git a/scanner.h b/scanner.h
index cf5bb1f2..3084999a 100644
--- a/scanner.h
+++ b/scanner.h
@@ -6,10 +6,10 @@
 class Scanner {
   private:
     int			in;
-    uchar		*bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof;
+    char		*bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof;
     uint		tchar, tline, cline;
   private:
-    uchar *fill(uchar*);
+    char *fill(char*);
   public:
     Scanner(int);
     int echo(ostream&);
diff --git a/scanner.re b/scanner.re
index f7b48cbb..bad4659c 100644
--- a/scanner.re
+++ b/scanner.re
@@ -10,7 +10,7 @@ extern YYSTYPE yylval;
 
 #define	BSIZE	8192
 
-#define	YYCTYPE		uchar
+#define	YYCTYPE		char
 #define	YYCURSOR	cursor
 #define	YYLIMIT		lim
 #define	YYMARKER	ptr
@@ -25,7 +25,7 @@ Scanner::Scanner(int i) : in(i),
     ;
 }
 
-uchar *Scanner::fill(uchar *cursor){
+char *Scanner::fill(char *cursor){
     if(!eof){
 	uint cnt = tok - bot;
 	if(cnt){
@@ -37,7 +37,7 @@ uchar *Scanner::fill(uchar *cursor){
 	    lim -= cnt;
 	}
 	if((top - lim) < BSIZE){
-	    uchar *buf = new uchar[(lim - bot) + BSIZE];
+	    char *buf = new char[(lim - bot) + BSIZE];
 	    memcpy(buf, tok, lim - tok);
 	    tok = buf;
 	    ptr = &buf[ptr - bot];
@@ -68,7 +68,7 @@ digit		= [0-9];
 */
 
 int Scanner::echo(ostream &out){
-    uchar *cursor = cur;
+    char *cursor = cur;
     tok = cursor;
 echo:
 /*!re2c
@@ -85,7 +85,7 @@ echo:
 
 
 int Scanner::scan(){
-    uchar *cursor = cur;
+    char *cursor = cur;
     uint depth;
 
 scan:
-- 
2.50.1