For DIAGOPT, change outshort(patno) to outshort(lino - 1).

This is more useful when looking for patterns; lino - 1 is probably
the line number in the patterns file.  DIAGOPT is off by default but
one can edit optim.h to enable it.

The other changes just clean up whitespace.

util/opt/mktab.y

@@ -153,8 +153,7 @@ optexpr	:	/* empty */
 			{ $$ = 0; }
 	|	expr
 	;
-expr	
-	:	'$' argno
+expr	:	'$' argno
 			{ $$ = lookup(0,EX_ARG,$2,0); }
 	|	NUMBER
 			{ $$ = lookup(0,EX_CON,(int)(short)$1,0); }
@@ -396,7 +395,8 @@ outpat(exprno, instrno)
 		out(rplexpr[i]);
 	}
 #ifdef DIAGOPT
-  	outshort(patno);
+	/* outshort(patno); */
+	outshort(lino - 1);
 #endif
 	patno++;
 	printf("\n");
@@ -424,4 +424,3 @@ out(w) {
 		outshort(w);
 	}
 }
-