Incorporated patches from FreeBSD ports.

diff --git a/scanner.cc b/scanner.cc
index 19b42597744b28ccd6868b4f110d90dfc96f5b1e..53fcb08d2052746841c96cfe7ba3130ef8003bab 100644 (file)
--- 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 cf5bb1f2bc7718f1611e9598726843e8a9738a56..3084999af3e3a4afb57b5ed6ddc2d4f0e1e9e5c5 100644 (file)
--- 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 f7b48cbbadf61f2105b352b5622cd2917abb872a..bad4659c5f3c2bee7cacff60106108ed1be47a34 100644 (file)
--- 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: