From: bruce <none@none>
Date: Tue, 28 Jul 1987 11:22:59 +0000 (+0000)
Subject: Parser outputs some stats and fixed error is pseudo.r
X-Git-Tag: release-5-5~3977
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=9e55f02c3bc66217be345be82ea5f110bc9308fd;p=ack.git

Parser outputs some stats and fixed error is pseudo.r
---

diff --git a/modules/src/em_opt/outputdfa.c b/modules/src/em_opt/outputdfa.c
index d87af0985..0e5bb9331 100644
--- a/modules/src/em_opt/outputdfa.c
+++ b/modules/src/em_opt/outputdfa.c
@@ -110,7 +110,7 @@ increase_next(size)
 	do {
 		newsize *= 2;
 	} while (newsize<size);
-	printf("Extending next/check arrays from %d to %d\n",currsize,newsize);
+	printf("Note: Extending next/check arrays from %d to %d\n",currsize,newsize);
 	next = (int *)Realloc(next,newsize);
 	check = (int *)Realloc(check,newsize);
 	/* clear ends of new arrays */
@@ -191,9 +191,13 @@ outdfa()
 		else
 			base[s] = EMPTY;
 	}
-
+	/* give some statistics on size of dfa */
+	printf("Number of patterns: %d\n", numpatterns);
+	printf("Longest pattern: %d\n", maxpattern);
+	printf("Longest replacement: %d\n", maxreplacement);
+	printf("Dfa contains %d distinct state/opcode pairs\n", numentries);
+	printf("Compacted using row displacement into %d entries\n",maxpos);
 	/* output the arrays */
-	printf("Compacted %d entries into %d positions\n",numentries,maxpos);
 	fprintf(ofile,"struct dfa OO_checknext[] = {\n");
 	for(i=0;i<=maxpos;i++) {
 		fprintf(ofile,"\t/* %4d */\t",i);
diff --git a/modules/src/em_opt/parser.g b/modules/src/em_opt/parser.g
index 3edec5763..425dcbcac 100644
--- a/modules/src/em_opt/parser.g
+++ b/modules/src/em_opt/parser.g
@@ -23,6 +23,7 @@ static char rcsidp1[] = "$Header$";
 struct state	*states[MAXSTATES];
 struct action	*actions[MAXSTATES];
 struct mnems	patterns[MAXSTATES];
+int		numpatterns = 0;	/* Number of patterns */
 int		higheststate = 0;	/* Highest state yet allocated */
 struct idf	*ops;			/* Chained list of all ops */
 int		maxpattern = 0;
@@ -59,6 +60,7 @@ optimization
 	':'
 	action(&repllist)
 			{
+			numpatterns++;
 			addaction(startline,currentstate,restrictions,
 				finaltest,repllist);
 			}
diff --git a/modules/src/em_opt/parser.h b/modules/src/em_opt/parser.h
index 412a5e69e..ab365c6a1 100644
--- a/modules/src/em_opt/parser.h
+++ b/modules/src/em_opt/parser.h
@@ -75,6 +75,7 @@ struct state {
 extern struct state	*states[MAXSTATES];
 extern struct action	*actions[MAXSTATES];
 extern struct mnems	patterns[MAXSTATES];
+extern int		numpatterns;	/* Number of patterns */
 extern int		higheststate;	/* Highest state yet allocated */
 extern struct idf	*ops;		/* Chained list of all ops */
 extern int		maxpattern;
diff --git a/modules/src/em_opt/pseudo.r b/modules/src/em_opt/pseudo.r
index 56fca96b6..fecb834f1 100644
--- a/modules/src/em_opt/pseudo.r
+++ b/modules/src/em_opt/pseudo.r
@@ -1,22 +1,17 @@
 df_dlb	| label:l	|
-	register p_instr p = GETNXTPATT();
-	FLUSHDFA(p);
+	FLUSHDFA();
 	C_df_dlb(l);
 df_dnam	| char *:s	|
-	register p_instr p = GETNXTPATT();
-	FLUSHDFA(p);
+	FLUSHDFA();
 	C_df_dnam(s);
 pro	| char *:s arith:l	|
-	register p_instr p = GETNXTPATT();
-	FLUSHDFA(p);
+	FLUSHDFA();
 	C_pro(s,l);
 pro_narg	| char *:s	|
-	register p_instr p = GETNXTPATT();
-	FLUSHDFA(p);
+	FLUSHDFA();
 	C_pro_narg(s);
 end	| arith:l	|
-	register p_instr p = GETNXTPATT();
-	FLUSHDFA(p);
+	FLUSHDFA();
 	C_end(l);
 end_narg	|	|
 	FLUSHDFA();