Commit Diff

Commit:
459eae0c7098afbf9b572df241669209a37728eb
From:
rsc <devnull@localhost>
Date:
Message:
fix unsharp
Actions:
Patch | Tree
commit - adc93f6097615f16d57e8a24a256302f2144ec4e
commit + 459eae0c7098afbf9b572df241669209a37728eb
blob - 3db6768f6fe0710f2e7fabdf470b1efd40da3b04
blob + 31b11ce8a39408859f1da4debdb8b59ef8f5e2a3
--- src/cmd/yacc.c
+++ src/cmd/yacc.c
@@ -13,8 +13,8 @@
 #define SETBIT(a,i)	((a)[(i)>>5] |= (1<<((i)&037)))
 #define NWORDS(n)	(((n)+32)/32)
 
-#define PARSER		"#9/lib/yaccpar"
-#define PARSERS		"#9/lib/yaccpars"
+char *PARSER = "#9/lib/yaccpar";
+char *PARSERS = "#9/lib/yaccpars";
 #define TEMPNAME	"y.tmp.XXXXXX"
 #define ACTNAME		"y.acts.XXXXXX"
 #define OFILE		"tab.c"
@@ -183,7 +183,7 @@ char*	tempname;
 char*	actname;
 char	ttempname[] = TEMPNAME;
 char	tactname[] = ACTNAME;
-char*	parser = PARSER;
+char*	parser;
 char*	yydebug;
 
 	/* storage of types */
@@ -375,6 +375,9 @@ int	gtnm(void);
 void
 main(int argc, char *argv[])
 {
+	PARSER = unsharp(PARSER);
+	PARSERS = unsharp(PARSERS);
+	parser = PARSER;
 
 	setup(argc, argv);	/* initialize and read productions */
 	tbitset = NWORDS(ntokens);
@@ -399,7 +402,7 @@ others(void)
 {
 	int c, i, j;
 
-	finput = Bopen(unsharp(parser), OREAD);
+	finput = Bopen(parser, OREAD);
 	if(finput == 0)
 		error("cannot open parser %s: %r", parser);
 	warray("yyr1", levprd, nprod);