Commit Diff

Commit:
de1755b58dd9a4a7523d5303799e43db44c25cec
From:
Russ Cox <rsc@swtch.com>
Date:
Message:
lex: 64-bit bug R=rsc http://codereview.appspot.com/4830054
Actions:
Patch | Tree
commit - da7e3a5d39b3acf930ca5714aed4826435cb1e13
commit + de1755b58dd9a4a7523d5303799e43db44c25cec
blob - f6d7ff6b1b1f356b78c67d081b32e5b8c68546c3
blob + d9b03fde438662f1f5c58023c12f3e54be87d67d
--- src/cmd/lex/ldefs.h
+++ src/cmd/lex/ldefs.h
@@ -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);
blob - 2d57e3f371ed5d839cfb6fd29955c2a945e13bfa
blob + 964a60fe33fdd1f44a6d1d05482f8309d5045e81
--- src/cmd/lex/parser.y
+++ src/cmd/lex/parser.y
@@ -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 '$'
blob - 3996d21979d7d4e8fd7200064914f4884aa6da34
blob + dcbbb581aa50c5d81d4bcb03bd1a252374171d7e
--- src/cmd/lex/sub1.c
+++ src/cmd/lex/sub1.c
@@ -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;