View | Details | Raw Unified | Return to bug 43720
Collapse All | Expand All

(-)re2c/files/patch-aa (+109 lines)
Line 0 Link Here
1
--- ./scanner.re.orig	Thu Aug 26 23:46:32 1999
2
+++ ./scanner.re	Sat Oct  5 13:27:00 2002
3
@@ -10,7 +10,7 @@
4
 
5
 #define	BSIZE	8192
6
 
7
-#define	YYCTYPE		uchar
8
+#define	YYCTYPE		char
9
 #define	YYCURSOR	cursor
10
 #define	YYLIMIT		lim
11
 #define	YYMARKER	ptr
12
@@ -25,7 +25,7 @@
13
     ;
14
 }
15
 
16
-uchar *Scanner::fill(uchar *cursor){
17
+char *Scanner::fill(char *cursor){
18
     if(!eof){
19
 	uint cnt = tok - bot;
20
 	if(cnt){
21
@@ -37,7 +37,7 @@
22
 	    lim -= cnt;
23
 	}
24
 	if((top - lim) < BSIZE){
25
-	    uchar *buf = new uchar[(lim - bot) + BSIZE];
26
+	    char *buf = new char[(lim - bot) + BSIZE];
27
 	    memcpy(buf, tok, lim - tok);
28
 	    tok = buf;
29
 	    ptr = &buf[ptr - bot];
30
@@ -68,7 +68,7 @@
31
 */
32
 
33
 int Scanner::echo(ostream &out){
34
-    uchar *cursor = cur;
35
+    char *cursor = cur;
36
     tok = cursor;
37
 echo:
38
 /*!re2c
39
@@ -85,7 +85,7 @@
40
 
41
 
42
 int Scanner::scan(){
43
-    uchar *cursor = cur;
44
+    char *cursor = cur;
45
     uint depth;
46
 
47
 scan:
48
--- ./scanner.cc.orig	Thu Aug 26 23:46:32 1999
49
+++ ./scanner.cc	Sat Oct  5 13:27:00 2002
50
@@ -12,7 +12,7 @@
51
 
52
 #define	BSIZE	8192
53
 
54
-#define	YYCTYPE		uchar
55
+#define	YYCTYPE		char
56
 #define	YYCURSOR	cursor
57
 #define	YYLIMIT		lim
58
 #define	YYMARKER	ptr
59
@@ -27,7 +27,7 @@
60
     ;
61
 }
62
 
63
-uchar *Scanner::fill(uchar *cursor){
64
+char *Scanner::fill(char *cursor){
65
     if(!eof){
66
 	uint cnt = tok - bot;
67
 	if(cnt){
68
@@ -39,7 +39,7 @@
69
 	    lim -= cnt;
70
 	}
71
 	if((top - lim) < BSIZE){
72
-	    uchar *buf = new uchar[(lim - bot) + BSIZE];
73
+	    char *buf = new char[(lim - bot) + BSIZE];
74
 	    memcpy(buf, tok, lim - tok);
75
 	    tok = buf;
76
 	    ptr = &buf[ptr - bot];
77
@@ -62,7 +62,7 @@
78
 
79
 
80
 int Scanner::echo(ostream &out){
81
-    uchar *cursor = cur;
82
+    char *cursor = cur;
83
     tok = cursor;
84
 echo:
85
 {
86
@@ -117,7 +117,7 @@
87
 
88
 
89
 int Scanner::scan(){
90
-    uchar *cursor = cur;
91
+    char *cursor = cur;
92
     uint depth;
93
 
94
 scan:
95
--- ./scanner.h.orig	Thu Aug 26 23:46:32 1999
96
+++ ./scanner.h	Sat Oct  5 13:27:00 2002
97
@@ -6,10 +6,10 @@
98
 class Scanner {
99
   private:
100
     int			in;
101
-    uchar		*bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof;
102
+    char		*bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof;
103
     uint		tchar, tline, cline;
104
   private:
105
-    uchar *fill(uchar*);
106
+    char *fill(char*);
107
   public:
108
     Scanner(int);
109
     int echo(ostream&);

Return to bug 43720