svn commit: r226422 - head/usr.bin/m4

[Ed Schouten]

Author: ed
Date: Sun Oct 16 08:09:17 2011
New Revision: 226422
URL: http://svn.freebsd.org/changeset/base/226422

Log:
  Fix build of m4 with WARNS=6.
  
  Change the parser; rename `exp' to `exponent' not to collide with exp(3).

Modified:
  head/usr.bin/m4/Makefile
  head/usr.bin/m4/expr.c
  head/usr.bin/m4/main.c

Modified: head/usr.bin/m4/Makefile
==============================================================================
--- head/usr.bin/m4/Makefile	Sun Oct 16 08:04:43 2011	(r226421)
+++ head/usr.bin/m4/Makefile	Sun Oct 16 08:09:17 2011	(r226422)
@@ -9,6 +9,4 @@ CFLAGS+=-DEXTENDED
 
 SRCS=	eval.c expr.c look.c main.c misc.c gnum4.c trace.c
 
-WARNS?=	0
-
 .include <bsd.prog.mk>

Modified: head/usr.bin/m4/expr.c
==============================================================================
--- head/usr.bin/m4/expr.c	Sun Oct 16 08:04:43 2011	(r226421)
+++ head/usr.bin/m4/expr.c	Sun Oct 16 08:09:17 2011	(r226422)
@@ -71,8 +71,8 @@ __FBSDID("$FreeBSD$");
  *      nerel   :       shift { ("<" | ">" | "<=" | ">=") shift }
  *      shift   :       primary { ("<<" | ">>") primary }
  *      primary :       term { ("+" | "-") term }
- *      term    :       exp { ("*" | "/" | "%") exp }
- *      exp     :       unary { "**" unary }
+ *      term    :       exponent { ("*" | "/" | "%") exponent }
+ *      exponent:       unary { "**" unary }
  *      unary   :       factor
  *              |       ("+" | "-" | "~" | "!") unary
  *      factor  :       constant
@@ -115,12 +115,11 @@ static int nerel(int mayeval);
 static int shift(int mayeval);
 static int primary(int mayeval);
 static int term(int mayeval);
-static int exp(int mayeval);
+static int exponent(int mayeval);
 static int unary(int mayeval);
 static int factor(int mayeval);
 static int constant(int mayeval);
 static int num(int mayeval);
-static int geteqrel(int mayeval);
 static int skipws(void);
 static void experr(const char *);
 
@@ -388,16 +387,16 @@ primary(int mayeval)
 }
 
 /*
- * term : exp { ("*" | "/" | "%") exp }
+ * term : exponent { ("*" | "/" | "%") exponent }
  */
 static int
 term(int mayeval)
 {
 	int c, vl, vr;
 
-	vl = exp(mayeval);
+	vl = exponent(mayeval);
 	while ((c = skipws()) == '*' || c == '/' || c == '%') {
-		vr = exp(mayeval);
+		vr = exponent(mayeval);
 
 		switch (c) {
 		case '*':
@@ -426,10 +425,10 @@ term(int mayeval)
 }
 
 /*
- * exp : unary { "**" exp }
+ * exponent : unary { "**" exponent }
  */
 static int
-exp(int mayeval)
+exponent(int mayeval)
 {
 	int c, vl, vr, n;
 
@@ -562,7 +561,7 @@ constant(int mayeval)
  * num : digit | num digit
  */
 static int
-num(int mayeval)
+num(int mayeval __unused)
 {
 	int rval, c, base;
 	int ndig;

Modified: head/usr.bin/m4/main.c
==============================================================================
--- head/usr.bin/m4/main.c	Sun Oct 16 08:04:43 2011	(r226421)
+++ head/usr.bin/m4/main.c	Sun Oct 16 08:09:17 2011	(r226422)
@@ -34,9 +34,11 @@
  */
 
 #ifndef lint
+#if 0
 static char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
+#endif
 #endif /* not lint */
 
 #ifndef lint