Plan 9 from Bell Labs 2011-08-03

sys/src/cmd/lex/ldefs.h

@@ -155,7 +155,7 @@ extern void	mkmatch(void);
 extern int	mn0(int);
 extern int	mn1(int, int);
 extern int	mnp(int, void*);
-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);

sys/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 '$'

sys/src/cmd/lex/sub1.c

@@ -302,7 +302,7 @@ gch(void){
 }
 
 int
-mn2(int a, int d, int c)
+mn2(int a, int d, uintptr c)
 {
 	name[tptr] = a;
 	left[tptr] = d;