386BSD 0.1 development

[unix-history] / usr / src / usr.bin / yacc / reader.c

diff --git a/usr/src/usr.bin/yacc/reader.c b/usr/src/usr.bin/yacc/reader.c
index 295d891..3b724d3 100644 (file)
--- a/usr/src/usr.bin/yacc/reader.c
+++ b/usr/src/usr.bin/yacc/reader.c
@@ -5,21 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Robert Paul Corbett.
  *
  * This code is derived from software contributed to Berkeley by
  * Robert Paul Corbett.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)reader.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)reader.c   5.7 (Berkeley) 1/20/91";

 #endif /* not lint */
 
 #include "defs.h"
 #endif /* not lint */
 
 #include "defs.h"


@@ -430,7 +446,6 @@ loop:
                }
            }
        }
                }
            }
        }

-       putc('/', f);

        need_newline = 1;
        goto loop;
 
        need_newline = 1;
        goto loop;
 


@@ -1241,7 +1256,7 @@ loop:
            c = *cptr;
            if (c == '$')
            {
            c = *cptr;
            if (c == '$')
            {

-               fprintf(f, "yyval.%s ", tag);
+               fprintf(f, "yyval.%s", tag);

                ++cptr;
                FREE(d_line);
                goto loop;
                ++cptr;
                FREE(d_line);
                goto loop;


@@ -1250,7 +1265,7 @@ loop:
            {
                i = get_number();
                if (i > n) dollar_warning(d_lineno, i);
            {
                i = get_number();
                if (i > n) dollar_warning(d_lineno, i);

-               fprintf(f, "yyvsp[%d].%s ", i - n, tag);
+               fprintf(f, "yyvsp[%d].%s", i - n, tag);

                FREE(d_line);
                goto loop;
            }
                FREE(d_line);
                goto loop;
            }


@@ -1258,7 +1273,7 @@ loop:
            {
                ++cptr;
                i = -get_number() - n;
            {
                ++cptr;
                i = -get_number() - n;

-               fprintf(f, "yyvsp[%d].%s ", i, tag);
+               fprintf(f, "yyvsp[%d].%s", i, tag);

                FREE(d_line);
                goto loop;
            }
                FREE(d_line);
                goto loop;
            }


@@ -1271,10 +1286,10 @@ loop:
            {
                tag = plhs[nrules]->tag;
                if (tag == 0) untyped_lhs();
            {
                tag = plhs[nrules]->tag;
                if (tag == 0) untyped_lhs();

-               fprintf(f, "yyval.%s ", tag);
+               fprintf(f, "yyval.%s", tag);

            }
            else
            }
            else

-               fprintf(f, "yyval ");
+               fprintf(f, "yyval");

            cptr += 2;
            goto loop;
        }
            cptr += 2;
            goto loop;
        }


@@ -1288,7 +1303,7 @@ loop:
                    unknown_rhs(i);
                tag = pitem[nitems + i - n - 1]->tag;
                if (tag == 0) untyped_rhs(i, pitem[nitems + i - n - 1]->name);
                    unknown_rhs(i);
                tag = pitem[nitems + i - n - 1]->tag;
                if (tag == 0) untyped_rhs(i, pitem[nitems + i - n - 1]->name);

-               fprintf(f, "yyvsp[%d].%s ", i - n, tag);
+               fprintf(f, "yyvsp[%d].%s", i - n, tag);

            }
            else
            {
            }
            else
            {