cgram: conform to lint's strict bool mode, KNF

[bsdgames-darwin.git] / atc / lex.l

diff --git a/atc/lex.l b/atc/lex.l
index 325b3e689c1e0fafbfd415a3713e022fe1bb6820..01e38278a9d6b7a122c728e3fe53cdfea0fa5246 100644 (file)
--- a/atc/lex.l
+++ b/atc/lex.l
@@ -1,7 +1,9 @@
 %{
+/*     $NetBSD: lex.l,v 1.9 2015/06/19 06:02:31 dholland Exp $ */
+
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -14,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -44,15 +42,22 @@
  * For more info on this and all of my stuff, mail edjames@berkeley.edu.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)lex.l      5.2 (Berkeley) 4/30/90";*/
-static char rcsid[] = "$Id: lex.l,v 1.2 1993/08/01 18:57:07 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)lex.l      8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: lex.l,v 1.9 2015/06/19 06:02:31 dholland Exp $");
+#endif
 #endif /* not lint */
 
-#include "y.tab.h"
+#undef ECHO            /* XXX: work around lex(1) vs termios lameness */
+#include "grammar.h"
+
 extern int     line;
 
 %}
+%option nounput noinput
 %%
 [0-9]+                 { yylval.ival = atoi(yytext);  return(ConstOp); }
 height                 { return(HeightOp); }