* fixed <ctype> bugs

[bsdgames-darwin.git] / atc / grammar.y

diff --git a/atc/grammar.y b/atc/grammar.y
index a409b490eb8bec471cfddf1bc4fa640086e797db..2d82da53d367fa78f826a336d537dfdfe551ebc2 100644 (file)
--- a/atc/grammar.y
+++ b/atc/grammar.y
@@ -1,4 +1,4 @@
-/*     $NetBSD: grammar.y,v 1.3 1995/03/21 15:03:59 cgd Exp $  */
+/*     $NetBSD: grammar.y,v 1.8 2003/08/07 09:36:54 agc Exp $  */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -15,11 +15,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.
  *
@@ -63,11 +59,12 @@
 %{
 #include "include.h"
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)grammar.y  8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: grammar.y,v 1.3 1995/03/21 15:03:59 cgd Exp $";
+__RCSID("$NetBSD: grammar.y,v 1.8 2003/08/07 09:36:54 agc Exp $");
 #endif
 #endif /* not lint */
 
@@ -136,7 +133,7 @@ hdef:
 wdef:
        WidthOp '=' ConstOp ';'
                {
-               if (sp->height != 0)
+               if (sp->width != 0)
                        return (yyerror("Redefinition of 'width'."));
                else if ($3 < 3)
                        return (yyerror("'width' is too small."));
@@ -252,7 +249,6 @@ Apoint:
                sp->airport[sp->num_airports].y = $3;
                sp->airport[sp->num_airports].dir = dir;
                check_point($2, $3);
-               check_adir($2, $3, dir);
                sp->num_airports++;
                }
        ;
@@ -288,14 +284,18 @@ Lline:
        ;
 %%
 
+void
 check_edge(x, y)
+       int x, y;
 {
        if (!(x == 0) && !(x == sp->width - 1) && 
            !(y == 0) && !(y == sp->height - 1))
                yyerror("edge value not on edge.");
 }
 
+void
 check_point(x, y)
+       int x, y;
 {
        if (x < 1 || x >= sp->width - 1)
                yyerror("X value out of range.");
@@ -303,7 +303,9 @@ check_point(x, y)
                yyerror("Y value out of range.");
 }
 
+void
 check_linepoint(x, y)
+       int x, y;
 {
        if (x < 0 || x >= sp->width)
                yyerror("X value out of range.");
@@ -311,7 +313,9 @@ check_linepoint(x, y)
                yyerror("Y value out of range.");
 }
 
+void
 check_line(x1, y1, x2, y2)
+       int x1, y1, x2, y2;
 {
        int     d1, d2;
 
@@ -325,7 +329,9 @@ check_line(x1, y1, x2, y2)
                yyerror("Bad line endpoints.");
 }
 
+int
 yyerror(s)
+       const char *s;
 {
        fprintf(stderr, "\"%s\": line %d: %s\n", file, line, s);
        errors++;
@@ -333,7 +339,9 @@ yyerror(s)
        return (errors);
 }
 
+void
 check_edir(x, y, dir)
+       int x, y, dir;
 {
        int     bad = 0;
 
@@ -364,10 +372,7 @@ check_edir(x, y, dir)
                yyerror("Bad direction for entrance at exit.");
 }
 
-check_adir(x, y, dir)
-{
-}
-
+int
 checkdefs()
 {
        int     err = 0;