tlex: 64-bit bug - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit de1755b58dd9a4a7523d5303799e43db44c25cec
DIR parent da7e3a5d39b3acf930ca5714aed4826435cb1e13
HTML Author: Russ Cox <rsc@swtch.com>
Date: Tue, 2 Aug 2011 14:16:30 -0400
lex: 64-bit bug
R=rsc
http://codereview.appspot.com/4830054
Diffstat:
M src/cmd/lex/ldefs.h | 2 +-
M src/cmd/lex/parser.y | 2 +-
M src/cmd/lex/sub1.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
DIR diff --git a/src/cmd/lex/ldefs.h b/src/cmd/lex/ldefs.h
t@@ -156,7 +156,7 @@ extern void mkmatch(void);
extern int mnp(int, void*);
extern int mn0(int);
extern int mn1(int, int);
-extern int mn2(int, int, int);
+extern int mn2(int, int, uintptr);
extern void munputc(int);
extern void munputs(uchar *);
extern void *myalloc(int, int);
DIR diff --git a/src/cmd/lex/parser.y b/src/cmd/lex/parser.y
t@@ -196,7 +196,7 @@ r: CHAR
}
}
| SCON r
- ={ $$.i = mn2(RSCON,$2.i,$1.i); }
+ ={ $$.i = mn2(RSCON,$2.i,(uintptr)$1.cp); }
| '^' r
={ $$.i = mn1(CARAT,$2.i); }
| r '$'
DIR diff --git a/src/cmd/lex/sub1.c b/src/cmd/lex/sub1.c
t@@ -295,7 +295,7 @@ gch(void){
}
int
-mn2(int a, int d, int c)
+mn2(int a, int d, uintptr c)
{
name[tptr] = a;
left[tptr] = d;